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

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


BitKeeper/etc/logging_ok:
  auto-union

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

mysql-test/include/have_cp932.inc

+-- require r/have_cp932.require
+disable_query_log;
+show collation like "cp932_japanese_ci";
+enable_query_log;

mysql-test/r/have_cp932.require

+Collation	Charset	Id	Default	Compiled	Sortlen
+cp932_japanese_ci	cp932	95	Yes	Yes	1