Commit 37c33a0f authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
parents 2ff9460e 689fae64

client/mysql.cc

+3 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,9 @@ com_charset(String *buffer __attribute__((unused)), char *line) 
  if (new_cs)

  {

    charset_info= new_cs;

    mysql_set_character_set(&mysql, charset_info->csname);

    default_charset= (char *)charset_info->csname;

    default_charset_used= 1;

    put_info("Charset changed", INFO_INFO);

  }

  else put_info("Charset is not found", INFO_INFO);

mysql-test/r/mysql.result

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

unlock tables;

drop table t1;

ソ

ソ

\

\

c_cp932

\

\

\

ソ

ソ

ソ

ソ

ソ

ソ

ソ

\

\

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

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

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

mysql-test/t/mysql.test

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 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; set @@session.character_set_client= 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; 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 '\'"