summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2004-08-27 19:02:46 +0200
committerjoreland@mysql.com <>2004-08-27 19:02:46 +0200
commitcca01b01917359bd4b3bc911363e3f183f63d860 (patch)
treea2ffc983680f77c4abbae2c4675cc9bf9070b678 /mysql-test/t
parentf33207ac8d17136af169779ce47c67948a54c841 (diff)
parent521643c85a248bc7e664b811618030c565cedd19 (diff)
downloadmariadb-git-cca01b01917359bd4b3bc911363e3f183f63d860.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/ctype_create.test12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/t/ctype_create.test b/mysql-test/t/ctype_create.test
index 6d7ed6fc205..9a5cb025474 100644
--- a/mysql-test/t/ctype_create.test
+++ b/mysql-test/t/ctype_create.test
@@ -71,6 +71,18 @@ SHOW CREATE TABLE t1;
DROP TABLE t1;
#
+# Bug#
+# CREATE TABLE and CREATE DATABASE didn't fail in some cases
+#
+--error 1302
+create table t1 (a char) character set latin1 character set latin2;
+--error 1253
+create table t1 (a char) character set latin1 collate latin2_bin;
+--error 1302
+create database d1 default character set latin1 character set latin2;
+--error 1253
+create database d1 default character set latin1 collate latin2_bin;
+
#
#
DROP DATABASE mysqltest1;