Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0

into bob.(none):/home/reggie/bk/mysql5.0

config/ac-macros/character_sets.m4

@@ -405,3 +405,20 @@ AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"],
                    [Define the default charset name])
 AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_COLLATION_NAME], ["$default_collation"],
                    [Define the default charset name])
+
+# Shall we build the UCA-based Unicode collations
+AC_ARG_WITH(uca,
+    [  --without-uca           Skip building of the national Unicode collations.],
+    [with_uca=$withval],
+    [with_uca=yes]
+)
+
+AC_MSG_CHECKING([whether to compile national Unicode collations])
+
+if test "$with_uca" = "yes"
+then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([HAVE_UCA_COLLATIONS], [1], [national Unicode collations])
+else
+  AC_MSG_RESULT(no)
+fi

mysql-test/include/have_cp932.inc

@@ -0,0 +1,4 @@
+-- require r/have_cp932.require
+disable_query_log;
+show collation like "cp932_japanese_ci";
+enable_query_log;

mysql-test/include/have_eucjpms.inc

@@ -0,0 +1,4 @@
+-- require r/have_eucjpms.require
+disable_query_log;
+show collation like "eucjpms_japanese_ci";
+enable_query_log;

mysql-test/r/have_cp932.require

@@ -0,0 +1,2 @@
+Collation	Charset	Id	Default	Compiled	Sortlen
+cp932_japanese_ci	cp932	95	Yes	Yes	1

mysql-test/r/have_eucjpms.require

@@ -0,0 +1,2 @@
+Collation	Charset	Id	Default	Compiled	Sortlen
+eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1

mysql-test/t/ctype_cp932.test

@@ -1,3 +1,5 @@
+-- source include/have_cp932.inc
+
 --character_set cp932
 --disable_warnings
 drop table if exists t1;

mysql-test/t/ctype_eucjpms.test

@@ -1,3 +1,6 @@
+-- source include/have_eucjpms.inc
+
+
 --disable_warnings
 drop table if exists t1;
 drop table if exists t2;