mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
This commit is contained in:
bar@bar.intranet.mysql.r18.ru 2004-06-08 15:36:43 +05:00
commit 581ff1d900
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/r/ctype_ujis.result
View file

@ -111,3 +111,18 @@ no index
あ
あ
drop table t1;
CREATE TABLE t1 (
a char(1) NOT NULL default '',
b enum('あ','い') default NULL
) CHARACTER SET ujis;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(1) NOT NULL default '',
`b` enum('あ','い') default NULL
) ENGINE=MyISAM DEFAULT CHARSET=ujis
SHOW COLUMNS FROM t1;
Field Type Null Key Default Extra
a char(1)
b enum('あ','い') YES NULL
DROP TABLE t1;

10
mysql-test/t/ctype_ujis.test
View file

@ -73,3 +73,13 @@ create index idx_c1 on t1(c1);
select c1 as 'using index' from t1 where c1 like cast(concat(0xA4A2, '%') as char character set ujis);
select c1 as 'no index' from t1 where c1 like cast(concat('%',0xA4A2, '%') as char character set ujis);
drop table t1;
# Bug 2077
CREATE TABLE t1 (
a char(1) NOT NULL default '',
b enum('¤¢','¤¤') default NULL
) CHARACTER SET ujis;
SHOW CREATE TABLE t1;
SHOW COLUMNS FROM t1;
DROP TABLE t1;

2
sql/sql_show.cc
View file

@ -1251,7 +1251,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
packet->append(' ');
// check for surprises from the previous call to Field::sql_type()
if (type.ptr() != tmp)
type.set(tmp, sizeof(tmp),&my_charset_bin);
type.set(tmp, sizeof(tmp), system_charset_info);
field->sql_type(type);
packet->append(type.ptr(), type.length(), system_charset_info);