diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2003-12-16 17:39:33 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2003-12-16 17:39:33 +0400 |
| commit | 96636daf674aff9b744fb7f0a501a0cff36c9921 (patch) | |
| tree | 660f505bb2dce4c0702b3e56b69e6c82af2a30fa /mysql-test | |
| parent | 029e30b4aa357708bdbf924cfd78069fb19382bb (diff) | |
| download | mariadb-git-96636daf674aff9b744fb7f0a501a0cff36c9921.tar.gz | |
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly.
note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.
mysql-test/r/type_enum.result:
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
mysql-test/t/type_enum.test:
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
sql/field.cc:
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
sql/sql_show.cc:
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
sql/table.cc:
proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/type_enum.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/type_enum.test | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result index 1903037480a..2ab6695e5c6 100644 --- a/mysql-test/r/type_enum.result +++ b/mysql-test/r/type_enum.result @@ -1636,6 +1636,7 @@ t1 CREATE TABLE `t1` ( `a` enum('','a','b') NOT NULL default 'b' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; +set names latin1; create table t1 (a enum(0xE4, '1', '2') not null default 0xE4); show columns from t1; Field Type Null Key Default Extra @@ -1643,6 +1644,6 @@ a enum('ä','1','2') ä show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('ä','1','2') NOT NULL default '?' + `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 bcebb1a5b27..c53277334a6 100644 --- a/mysql-test/t/type_enum.test +++ b/mysql-test/t/type_enum.test @@ -29,8 +29,8 @@ drop table t1; # Bug #2077 # +set names latin1; 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; |