Commit 25896a82 authored by unknown's avatar unknown
Browse files

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
parents d4b3d364 b1d7d821

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_cp932.require

disable_query_log;

show collation like "cp932_japanese_ci";

enable_query_log;

mysql-test/r/ctype_cp932.result

0 → 100644
+8598 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/have_cp932.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Collation	Charset	Id	Default	Compiled	Sortlen

cp932_japanese_ci	cp932	95	Yes	Yes	1

mysql-test/t/ctype_cp932.test

0 → 100644
+408 −0

File added.

Preview size limit exceeded, changes collapsed.