summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-15 23:18:40 +0100
committerunknown <monty@mysql.com>2003-12-15 23:18:40 +0100
commit52a39105116d42159ac005c6caece6928d6039e7 (patch)
treed2cad6e33e67df6f69b6a44ea41f8014562beb75 /mysql-test
parentc3617bb88ce77bcf614037aa371ec0a432ce4c21 (diff)
parent987d8ff9a38acd773fdb23a45c71a3a8a8197d64 (diff)
downloadmariadb-git-52a39105116d42159ac005c6caece6928d6039e7.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_enum.result10
-rw-r--r--mysql-test/t/type_enum.test10
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result
index 42ee54ce105..1903037480a 100644
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/r/type_enum.result
@@ -1636,3 +1636,13 @@ t1 CREATE TABLE `t1` (
`a` enum('','a','b') NOT NULL default 'b'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
+create table t1 (a enum(0xE4, '1', '2') not null default 0xE4);
+show columns from t1;
+Field Type Null Key Default Extra
+a enum('ä','1','2') ä
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` enum('ä','1','2') NOT NULL default '?'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
diff --git a/mysql-test/t/type_enum.test b/mysql-test/t/type_enum.test
index 49ba73acaa8..bcebb1a5b27 100644
--- a/mysql-test/t/type_enum.test
+++ b/mysql-test/t/type_enum.test
@@ -24,3 +24,13 @@ drop table t1;
create table t1 (a enum (' ','a','b ') not null default 'b ');
show create table t1;
drop table t1;
+
+#
+# Bug #2077
+#
+
+create table t1 (a enum(0xE4, '1', '2') not null default 0xE4);
+show columns from t1;
+# should be fixed ASAP
+show create table t1;
+drop table t1;