bzr commit into mysql-6.0 branch (bar:2899) Bug#158

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-6.0.b37129/

 2899 Alexander Barkov	2008-11-01
      Bug#158 ENUM and SET types does not accept valid cp1251 character
      The bug was fixed earlier.
      Just adding test case.
modified:
  mysql-test/r/ctype_cp1251.result
  mysql-test/t/ctype_cp1251.test

=== modified file 'mysql-test/r/ctype_cp1251.result'
--- a/mysql-test/r/ctype_cp1251.result	2007-03-09 21:08:24 +0000
+++ b/mysql-test/r/ctype_cp1251.result	2008-11-01 04:50:21 +0000
@@ -70,3 +70,14 @@ we_ivo	NULL
 we_iliyan	NULL
 we_martin	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;

=== modified file 'mysql-test/t/ctype_cp1251.test'
--- a/mysql-test/t/ctype_cp1251.test	2005-10-13 14:16:19 +0000
+++ b/mysql-test/t/ctype_cp1251.test	2008-11-01 04:50:21 +0000
@@ -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('� cp1251;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
 # End of 4.1 tests