Character set sets now check if required non-dynamic charsets were really compiled

BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Delete: mysql-test/t/ctype_ujis-master.opt

9 files changed, 35 insertions, 11 deletions

diff --git a/mysql-test/include/have_ucs2.inc b/mysql-test/include/have_ucs2.inc
new file mode 100644
index 00000000000..92ec9b5fb44
--- /dev/null
+++ b/mysql-test/include/have_ucs2.inc
@@ -0,0 +1,4 @@
+-- require r/have_ucs2.require
+disable_query_log;
+show collation like "ucs2_general_ci";
+enable_query_log;
diff --git a/mysql-test/include/have_ujis.inc b/mysql-test/include/have_ujis.inc
new file mode 100644
index 00000000000..ecceb7a8408
--- /dev/null
+++ b/mysql-test/include/have_ujis.inc
@@ -0,0 +1,4 @@
+-- require r/have_ujis.require
+disable_query_log;
+show collation like "ujis_japanese_ci";
+enable_query_log;
diff --git a/mysql-test/r/have_ucs2.require b/mysql-test/r/have_ucs2.require
new file mode 100644
index 00000000000..9d7079740ad
--- /dev/null
+++ b/mysql-test/r/have_ucs2.require
@@ -0,0 +1,2 @@
+Collation	Charset	Id	D	C	Sortlen
+ucs2_general_ci	ucs2	35	Y		0
diff --git a/mysql-test/r/have_ujis.require b/mysql-test/r/have_ujis.require
new file mode 100644
index 00000000000..5f7ce2a50c7
--- /dev/null
+++ b/mysql-test/r/have_ujis.require
@@ -0,0 +1,2 @@
+Collation	Charset	Id	D	C	Sortlen
+ujis_japanese_ci	ujis	12	Y		0
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result
index 6621be98073..5975ac8a8a0 100644
--- a/mysql-test/r/isam.result
+++ b/mysql-test/r/isam.result
@@ -73,14 +73,14 @@ test.t2	check	error	Table 't2' was not locked with LOCK TABLES
 test.t1	check	status	OK
 show columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra
-a	int(11)	binary		PRI	0	
-b	int(11)	binary		MUL	0	
-c	int(11)	binary			0	
+a	int(11)	NULL		PRI	0	
+b	int(11)	NULL		MUL	0	
+c	int(11)	NULL			0	
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-a	int(11)	binary		PRI	0		select,insert,update,references	
-b	int(11)	binary		MUL	0		select,insert,update,references	
-c	int(11)	binary			0		select,insert,update,references	
+a	int(11)	NULL		PRI	0		select,insert,update,references	
+b	int(11)	NULL		MUL	0		select,insert,update,references	
+c	int(11)	NULL			0		select,insert,update,references	
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE	
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index ab528dc11e7..66732520f4d 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -1,3 +1,5 @@
+-- source include/have_ucs2.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
diff --git a/mysql-test/t/ctype_ujis-master.opt b/mysql-test/t/ctype_ujis-master.opt
deleted file mode 100644
index 1f4183d5027..00000000000
--- a/mysql-test/t/ctype_ujis-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---default-character-set=ujis
diff --git a/mysql-test/t/ctype_ujis.test b/mysql-test/t/ctype_ujis.test
index 7308f26a8cf..e41caf55948 100644
--- a/mysql-test/t/ctype_ujis.test
+++ b/mysql-test/t/ctype_ujis.test
@@ -1,3 +1,5 @@
+-- source include/have_ujis.inc
+
 #
 # Tests with the ujis character set
 #
@@ -9,7 +11,7 @@ drop table if exists t1;
 # Test problem with LEFT()
 #
 
-create table t1 (c text);
+create table t1 (c text character set ujis);
 insert into t1 values (0xa4a2),(0xa4a3);
 select hex(left(c,1)) from t1 group by c;
 drop table t1;
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 84ef917fe00..1278cb6c54a 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -169,7 +169,10 @@ To make maintaining easier please:
   <family>Japanese</family>
   <description>EUC-JP Japanese</description>
   <alias>euc-jp</alias>
-  <collation name="ujis_japanese_ci"	id="12"	order="Japanese"	flag="primary"/>
+  <collation name="ujis_japanese_ci"	id="12"	order="Japanese">
+    <flag>primary</flag>
+    <flag>compiled</flag>
+  </collation>
 </charset>
 
 <charset name="sjis">
@@ -178,7 +181,10 @@ To make maintaining easier please:
   <alias>s-jis</alias>
   <alias>shift-jis</alias>
   <alias>x-sjis</alias>
-  <collation name="sjis_japanese_ci" 	id="13"	order="Japanese"	flag="primary"/>
+  <collation name="sjis_japanese_ci" 	id="13"	order="Japanese">
+    <flag>primary</flag>
+    <flag>compiled</flag>
+  </collation>
 </charset>
 
 <charset name="cp1251">
@@ -376,7 +382,10 @@ To make maintaining easier please:
 <charset name="ucs2">
   <family>Unicode</family>
   <description>UCS-2 Unicode</description>
-  <collation name="ucs2_general_ci"	id="35"	flag="primary"/>
+  <collation name="ucs2_general_ci"	id="35">
+    <flag>primary</flag>
+    <flag>compiled</flag>
+  </collation>
 </charset>
 
 <charset name="cp866">