diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-28 15:08:16 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-28 15:08:16 -0500 |
| commit | bd4c0c11758da0656067355cf1a2b9bc6d222b77 (patch) | |
| tree | 7da39bb7f96c38f759febb3496356fc8a05b1935 | |
| parent | db875c0c070d34c525f650b15912273d74d4f8aa (diff) | |
| parent | be820c11d045345aaefea21ead49cfac60b1c31c (diff) | |
| download | mariadb-git-bd4c0c11758da0656067355cf1a2b9bc6d222b77.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| -rw-r--r-- | mysql-test/r/mysql.result | 14 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index cfcb3eaf334..3bba1944c52 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -61,16 +61,16 @@ database() test unlock tables; drop table t1; -ﾂソ -ﾂソ +ソ +ソ c_cp932 -ﾂソ -ﾂソ -ﾂソ +ソ +ソ +ソ 繧ｽ 繧ｽ -ﾂソ -ﾂソ +ソ +ソ +----------------------+------------+--------+ | concat('>',col1,'<') | col2 | col3 | +----------------------+------------+--------+ diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 5fc0692c70e..6b99f5154aa 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -52,10 +52,10 @@ drop table t1; --exec $MYSQL --default-character-set=cp932 test -e "charset utf8;" # its usage to switch internally in mysql to requested charset ---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ﾂソ'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ﾂソ'); select * from t1; drop table t1;" ---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ﾂソ'" ---exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ﾂソ'" ---exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ﾂソ'" +--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ソ'); select * from t1; drop table t1;" +--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'" +--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ソ'" +--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ソ'" # # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string". |