From 1ffa2a3dc4ffe0dc5efd3e29f404db1ccbfb7949 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Tue, 18 Jan 2005 13:12:40 -0800
Subject: [PATCH] Update type_float test results after merge.

---
 mysql-test/r/type_float.result | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index 6e8275d5dac..1f5a34917d7 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -143,6 +143,15 @@ drop table t1;
 create table t1 (f float(54));
 ERROR 42000: Incorrect column specifier for column 'f'
 drop table if exists t1;
+create table t1 (d1 double, d2 double unsigned);
+insert into t1 set d1 = -1.0;
+update t1 set d2 = d1;
+Warnings:
+Warning	1264	Data truncated; out of range for column 'd2' at row 1
+select * from t1;
+d1	d2
+-1	0
+drop table t1;
 create table t1 (f float(4,3));
 insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
 Warnings:
@@ -179,13 +188,6 @@ f
 9.999
 9.999
 drop table if exists t1;
-create table t1 (d1 double, d2 double unsigned);
-insert into t1 set d1 = -1.0;
-update t1 set d2 = d1;
-select * from t1;
-d1	d2
--1	0
-drop table t1;
 create table t1 (c char(20));
 insert into t1 values (5e-28);
 select * from t1;