summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2005-10-28 21:42:01 +0400
committerunknown <sergefp@mysql.com>2005-10-28 21:42:01 +0400
commitd5bb660640c9cb968469f38e2fa5a971782cf254 (patch)
tree206f1d6d385443db713dfe41b564690dda5015e0 /mysql-test
parent61e2ed9c019805f695f7c12ffcb40b6b952086ab (diff)
parent115bf43602424f2bba326efab6d7ec51c66ac4e5 (diff)
downloadmariadb-git-d5bb660640c9cb968469f38e2fa5a971782cf254.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug14139
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/create.result11
-rw-r--r--mysql-test/t/create.test8
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 6edd4cbc48f..55ad6e3304a 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -621,3 +621,14 @@ create table if not exists t1 (a int);
Warnings:
Note 1050 Table 't1' already exists
drop table t1;
+create table t1 (
+a varchar(112) charset utf8 collate utf8_bin not null,
+primary key (a)
+) select 'test' as a ;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
+ PRIMARY KEY (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 73184853d1a..966be8b58a3 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -526,4 +526,12 @@ create table t1 (a int);
create table if not exists t1 (a int);
drop table t1;
+# BUG#14139
+create table t1 (
+ a varchar(112) charset utf8 collate utf8_bin not null,
+ primary key (a)
+) select 'test' as a ;
+show create table t1;
+drop table t1;
+
# End of 4.1 tests