From c9c8955fc9a8647f69ab9c762150a0e60021d182 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Tue, 1 Feb 2005 11:50:43 +0400
Subject: [PATCH 1/2] character_sets.m4:   --with-uca configure.in argument.  
 The rest of the changes are pending from 4.1 tree

---
 config/ac-macros/character_sets.m4 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4
index c83cc63a8aa..6efd31fdb05 100644
--- a/config/ac-macros/character_sets.m4
+++ b/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

From b9054c5e4aaa66364447911c228b1235ed2df657 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Tue, 1 Feb 2005 14:37:51 +0400
Subject: [PATCH 2/2] Skip cp932 and eucjpms tests when the character sets are
 not compiled.

---
 mysql-test/include/have_cp932.inc   | 4 ++++
 mysql-test/include/have_eucjpms.inc | 4 ++++
 mysql-test/r/have_cp932.require     | 2 ++
 mysql-test/r/have_eucjpms.require   | 2 ++
 mysql-test/t/ctype_cp932.test       | 2 ++
 mysql-test/t/ctype_eucjpms.test     | 3 +++
 6 files changed, 17 insertions(+)
 create mode 100644 mysql-test/include/have_cp932.inc
 create mode 100644 mysql-test/include/have_eucjpms.inc
 create mode 100644 mysql-test/r/have_cp932.require
 create mode 100644 mysql-test/r/have_eucjpms.require

diff --git a/mysql-test/include/have_cp932.inc b/mysql-test/include/have_cp932.inc
new file mode 100644
index 00000000000..b500dac0bbe
--- /dev/null
+++ b/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;
diff --git a/mysql-test/include/have_eucjpms.inc b/mysql-test/include/have_eucjpms.inc
new file mode 100644
index 00000000000..a5e1a5ac547
--- /dev/null
+++ b/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;
diff --git a/mysql-test/r/have_cp932.require b/mysql-test/r/have_cp932.require
new file mode 100644
index 00000000000..988d720ed2c
--- /dev/null
+++ b/mysql-test/r/have_cp932.require
@@ -0,0 +1,2 @@
+Collation	Charset	Id	Default	Compiled	Sortlen
+cp932_japanese_ci	cp932	95	Yes	Yes	1
diff --git a/mysql-test/r/have_eucjpms.require b/mysql-test/r/have_eucjpms.require
new file mode 100644
index 00000000000..f35621b2c1a
--- /dev/null
+++ b/mysql-test/r/have_eucjpms.require
@@ -0,0 +1,2 @@
+Collation	Charset	Id	Default	Compiled	Sortlen
+eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1
diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/t/ctype_cp932.test
index 24da8a76dcd..fed87af3adc 100644
--- a/mysql-test/t/ctype_cp932.test
+++ b/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;
diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/t/ctype_eucjpms.test
index 578d116fcb9..cec1e2a9861 100644
--- a/mysql-test/t/ctype_eucjpms.test
+++ b/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;