summaryrefslogtreecommitdiff
path: root/mysql-test/t/csv.test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-02 17:34:50 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-02 17:34:50 +0300
commitc17e2664371c1643135f8cfc245b8c1ed4f59f3d (patch)
treeb41651212156dfd684f8a54791bdf3b7cfc85c25 /mysql-test/t/csv.test
parent5a05c470eeede16c33586f95e0bf555c80bd81fb (diff)
parentc04e5bbe7069566b5842cc1f04687d5c964ab2ad (diff)
downloadmariadb-git-c17e2664371c1643135f8cfc245b8c1ed4f59f3d.tar.gz
Manual merge from mysql-next-mr.
Conflicts: - sql/sql_base.cc
Diffstat (limited to 'mysql-test/t/csv.test')
-rw-r--r--mysql-test/t/csv.test20
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index ea949f463c9..609a49c7634 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -1807,17 +1807,17 @@ unlock tables;
drop table t1;
#
-# Bug#41441 repair csv table crashes debug server
-#
-# Note: The test should be removed after Bug#33717 is fixed
+# Bug#33717 INSERT...(default) fails for enum. Crashes CSV tables, loads spaces for MyISAM
+#
+CREATE TABLE t1 (e enum('foo','bar') NOT NULL) ENGINE = CSV;
+INSERT INTO t1 VALUES();
+INSERT INTO t1 VALUES(default);
+INSERT INTO t1 VALUES(0);
+INSERT INTO t1 VALUES(3);
+INSERT INTO t1 VALUES(-1);
+SELECT * FROM t1;
+DROP TABLE t1;
-create table t1(a enum ('a') not null) engine=csv;
-insert into t1 values (2);
---error ER_CRASHED_ON_USAGE
-select * from t1 limit 1;
-repair table t1;
-select * from t1 limit 1;
-drop table t1;
#
# Bug #40814 CSV engine does not parse \X characters when they occur in unquoted fields