Merge mysql.com:/d2/hf/common/my51-common

into  mysql.com:/d2/hf/mr10/my51-mr10


mysql-test/t/csv.test:
  Auto merged

1 files changed, 15 insertions, 1 deletions

diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index 22e533e2655..369b01b4ab7 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -1596,7 +1596,7 @@ insert into bug22080_1 values(2,'string');
 insert into bug22080_1 values(3,'string');
 
 # Currupt the file as described in the bug report
---exec sed -e 's/"2"/2"/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV
+--exec sed -e 's/2/2"/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV
 --exec sed -e 's/2","/2",/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV
 
 --exec cat $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV
@@ -1606,3 +1606,17 @@ check table bug22080_2;
 check table bug22080_3;
 
 drop tables bug22080_1,bug22080_2,bug22080_3;
+
+#
+# Testing float type
+#
+create table float_test (id float,string varchar(64)) Engine=CSV;
+insert into float_test values(1.0,'string');
+insert into float_test values(2.23,'serg.g');
+insert into float_test values(0.03,'string');
+insert into float_test values(0.19,'string');
+insert into float_test values(.67,'string');
+insert into float_test values(9.67,'string');
+select * from float_test;
+
+drop table float_test;