bk commit into 5.1 tree (kaa:1.2457) BUG#18743

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-21 19:50:48+03:00, kaa@stripped +3 -0
  Moved the test requiring cp932 to a separate unit.
  
  This is for bug #18743.

  mysql-test/r/mysql_cp932.result@stripped, 2007-02-21 19:50:43+03:00, kaa@stripped +10 -0
    Moved the test requiring cp932 to a separate unit

  mysql-test/r/mysql_cp932.result@stripped, 2007-02-21 19:50:43+03:00, kaa@stripped +0 -0

  mysql-test/t/mysql.test@stripped, 2007-02-21 19:50:43+03:00, kaa@stripped +0 -14
    Moved the test requiring cp932 to a separate unit

  mysql-test/t/mysql_cp932.test@stripped, 2007-02-21 19:50:43+03:00, kaa@stripped +22 -0
    Moved the test requiring cp932 to a separate unit

  mysql-test/t/mysql_cp932.test@stripped, 2007-02-21 19:50:43+03:00, kaa@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.1-maint
--- New file ---
+++ mysql-test/r/mysql_cp932.result	07/02/21 19:50:43
ƒ\
ƒ\
c_cp932
ƒ\
ƒ\
ƒ\
ソ
ソ
ƒ\
ƒ\

--- New file ---
+++ mysql-test/t/mysql_cp932.test	07/02/21 19:50:43
# 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 'ƒ\'"



--- 1.39/mysql-test/t/mysql.test	2007-02-21 19:50:55 +03:00
+++ 1.40/mysql-test/t/mysql.test	2007-02-21 19:50:55 +03:00
@@ -44,20 +44,6 @@ 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".
 #
 --exec $MYSQL -t test -e "create table t1 (col1 binary(4), col2 varchar(10), col3 int);
insert into t1 values ('a', 'b', 123421),('a ', '0123456789', 4), ('abcd', '', 4); select
concat('>',col1,'<'), col2, col3 from t1; drop table t1;" 2>&1