summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2009-11-09 14:53:49 +0400
committerAlexander Barkov <bar@mysql.com>2009-11-09 14:53:49 +0400
commit3bb7d3eebf5678d67933d7ae7cf1b9da8c70dbff (patch)
tree09cbc56f79018c9456f995a63a305334ac15b020
parenteb852073c3fcb53630ea70fa775d30e15cbc903a (diff)
downloadmariadb-git-3bb7d3eebf5678d67933d7ae7cf1b9da8c70dbff.tar.gz
Backporting test for Bug#158 ENUM and SET types does not accept valid cp1251 character
-rw-r--r--mysql-test/r/ctype_cp1251.result11
-rw-r--r--mysql-test/t/ctype_cp1251.test10
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/r/ctype_cp1251.result
index 47797af3cbe..bf0bc07c50e 100644
--- a/mysql-test/r/ctype_cp1251.result
+++ b/mysql-test/r/ctype_cp1251.result
@@ -70,3 +70,14 @@ we_ivo NULL
we_martin NULL
we_toshko NULL
drop table t1;
+CREATE TABLE t1 (
+e1 enum('ябълка'),
+e2 enum('мляко')
+) ENGINE=MYISAM character set cp1251;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `e1` enum('ябълка') DEFAULT NULL,
+ `e2` enum('мляко') DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=cp1251
+DROP TABLE t1;
diff --git a/mysql-test/t/ctype_cp1251.test b/mysql-test/t/ctype_cp1251.test
index 463a9cea4bc..b6a1cfc3f98 100644
--- a/mysql-test/t/ctype_cp1251.test
+++ b/mysql-test/t/ctype_cp1251.test
@@ -47,4 +47,14 @@ insert into t1 (a) values ('air'),
select * from t1 where a like 'we_%';
drop table t1;
+#
+# Bug#158 ENUM and SET types does not accept valid cp1251 character
+#
+CREATE TABLE t1 (
+ e1 enum('ябълка'),
+ e2 enum('мляко')
+) ENGINE=MYISAM character set cp1251;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
# End of 4.1 tests