Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql

Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
f0fb08dd · shuichi@mysql.com · 9f5a51e8 · 720418fe · f0fb08dd · f0fb08dd
Commit f0fb08dd authored May 05, 2005 by shuichi@mysql.com
6 changed files
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -214,6 +214,7 @@ serg@serg.mysql.com
 serg@sergbook.mylan
 serg@sergbook.mysql.com
 sergefp@mysql.com
+shuichi@mysql.com
 sinisa@rhols221.adsl.netsonic.fi
 stewart@mysql.com
 svoj@mysql.com

--- a/mysql-test/include/have_cp932.inc
+++ b/mysql-test/include/have_cp932.inc
+-- require r/have_cp932.require
+disable_query_log;
+show collation like "cp932_japanese_ci";
+enable_query_log;
--- a/mysql-test/r/ctype_cp932.result
+++ b/mysql-test/r/ctype_cp932.result
--- a/mysql-test/r/have_cp932.require
+++ b/mysql-test/r/have_cp932.require
+Collation	Charset	Id	Default	Compiled	Sortlen
+cp932_japanese_ci	cp932	95	Yes	Yes	1
--- a/mysql-test/t/ctype_cp932.test
+++ b/mysql-test/t/ctype_cp932.test
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c