summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <tnurnberg@mysql.com/sin.azundris.com>2007-02-12 14:49:34 +0100
committerunknown <tnurnberg@mysql.com/sin.azundris.com>2007-02-12 14:49:34 +0100
commit1c28548966a898ff524d74cade3f975f3bfd5511 (patch)
treee1355353ed3b055f060245923d22a0c6497d5e20 /mysql-test/t
parent686be32ecaf5c12a99aea1f0f298f551929df5e9 (diff)
parent91f684a5ad2ff725cef0596a06993e4e2754c059 (diff)
downloadmariadb-git-1c28548966a898ff524d74cade3f975f3bfd5511.tar.gz
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/tnurnberg/24660/50-24660 sql/table.cc: Auto merged sql/unireg.cc: Auto merged
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/type_enum.test22
1 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/t/type_enum.test b/mysql-test/t/type_enum.test
index 68f5664c36d..4b3429d9ea0 100644
--- a/mysql-test/t/type_enum.test
+++ b/mysql-test/t/type_enum.test
@@ -136,4 +136,24 @@ alter table t1 add f2 enum(0xFFFF);
show create table t1;
drop table t1;
-# End of 4.1 tests
+#
+# Bug#24660 "enum" field type definition problem
+#
+create table t1(russian enum('E','F','EF','FE') NOT NULL DEFAULT'E');
+show create table t1;
+drop table t1;
+
+create table t1(denormal enum('E','F','E,F','F,E') NOT NULL DEFAULT'E');
+show create table t1;
+drop table t1;
+
+create table t1(russian_deviant enum('E','F','EF','F,E') NOT NULL DEFAULT'E');
+show create table t1;
+drop table t1;
+
+# ER_WRONG_FIELD_TERMINATORS
+--error 1083
+create table t1(exhausting_charset enum('ABCDEFGHIJKLMNOPQRSTUVWXYZ','
+  !"','#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~','xx\','yy\','zz'));
+
+--echo End of 4.1 tests