Commit a1338e05 authored by unknown's avatar unknown
Browse files

Moved the test requiring cp932 to a separate unit. 

This is for bug #18743.


mysql-test/t/mysql.test:
  Moved the test requiring cp932 to a separate unit
mysql-test/r/mysql_cp932.result:
  Moved the test requiring cp932 to a separate unit
mysql-test/t/mysql_cp932.test:
  Moved the test requiring cp932 to a separate unit
parent d74016bb

mysql-test/r/mysql_cp932.result

0 → 100644
+10 −0
Original line number Diff line number Diff line 
\

\

c_cp932

\

\

\

ソ

ソ

\

\

mysql-test/t/mysql.test

+0 −14
Original line number Diff line number Diff line
@@ -43,20 +43,6 @@ lock tables t1 write; 
unlock tables;

drop table t1;



#

# BUG#16217 - MySQL client misinterprets multi-byte char as escape `\' 

#



# new command \C or charset

--exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"

--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 '\'"



#

# Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".

#

mysql-test/t/mysql_cp932.test

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# This test should work in embedded server after we fix mysqltest

-- source include/not_embedded.inc



#

# Tests from mysql.test which require the cp932 character set

#

-- source include/have_cp932.inc



#

# BUG#16217 - MySQL client misinterprets multi-byte char as escape `\' 

#



# new command \C or charset

--exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"

--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 '\'"