Commit bd4c0c11 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
parents db875c0c be820c11

mysql-test/r/mysql.result

+7 −7
Original line number Diff line number Diff line
@@ -61,16 +61,16 @@ database() 
test

unlock tables;

drop table t1;

ƒ\

ƒ\

\

\

c_cp932

ƒ\

ƒ\

ƒ\

\

\

\

ソ

ソ

ƒ\

ƒ\

\

\

+----------------------+------------+--------+

| concat('>',col1,'<') | col2       | col3   |

+----------------------+------------+--------+

mysql-test/t/mysql.test

+4 −4
Original line number Diff line number Diff line
@@ -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".