Bug#28737177: MAIN.INFORMATION_SCHEMA_CS FAILS WITH RESULT CONTENT MISMATCH

The problem was that main.information_schema_cs (and a handful of other tests)
could sometimes fail due to missing characterset comments.

The root cause was the regression test for Bug#16204175 in main.ctype_uca.
This test temporarily replaced share/charset/Index.xml in the source directory
with its own file. If this happened to coincide with other tests depending
on the original contents of Index.xml, those tests would fail.

This patch fixes the problem by rewriting the regression test for Bug#16204175
such that it leaves Index.xml intact and instead restarts the server with
--character-sets-dir pointing to a different directory. This is similar to
what is already done in e.g. main.invalid_collation.

Change-Id: Ic1eef7b8f448ecf4620d77123e247f106fcd328a

Author: jhauglid

mysql-test/r/ctype_uca.result

@@ -7520,7 +7520,9 @@ DROP TABLE t1;
 # Bug #16204175 : COLLATION NAME MISSING FROM LOG MESSAGES
 #                 ABOUT LDML DEFINITION PROBLEMS
 #
-# restart
+#
+# Restart the server with a collation with invalid grammar rules.
+# restart:--character-sets-dir=MYSQL_TEST_DIR/std_data/bug16204175/
 # Check whether the new collation is loaded after restart
 SHOW COLLATION LIKE 'utf8_test';
 Collation	Charset	Id	Default	Compiled	Sortlen	Pad_attribute
@@ -7531,7 +7533,9 @@ ERROR HY000: Unknown collation: 'utf8_test'
 # Below error is caused as a result of this test. The error message
 # contains collation name which is added as a part of the fix.
 call mtr.add_suppression("Shift expected at '' for COLLATION : utf8_test");
-# restart
+#
+# Restart server with original character sets dir:
+# restart:--character-sets-dir=MYSQL_CHARSETSDIR
 #
 # End of 5.6 tests
 #

mysql-test/std_data/bug16204175/Index.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding="utf-8"?>
+<charsets max-id="99">
+<charset name="utf8">
+  <family>Unicode</family>
+  <description>UTF-8 Unicode</description>
+  <alias>utf-8</alias>
+  <collation name="utf8_test"            id="999">
+    <rules>
+      <reset>A</reset>
+    </rules>
+  </collation>
+</charset>
+</charsets>

mysql-test/t/ctype_uca.test

@@ -549,31 +549,11 @@ SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_ci;
 --echo #                 ABOUT LDML DEFINITION PROBLEMS
 --echo #
 
-
-# Creating a temporary file for Index.xml
---copy_file $MYSQL_CHARSETSDIR/Index.xml $MYSQLTEST_VARDIR/temp.xml
---remove_file $MYSQL_CHARSETSDIR/Index.xml
-
-# Adding an unknown collation with invalid grammer rules.
-# Please make sure the id is not used by any existing collations.
---write_file $MYSQL_CHARSETSDIR/Index.xml
-<?xml version='1.0' encoding="utf-8"?>
-<charsets max-id="99">
-<charset name="utf8">
-  <family>Unicode</family>
-  <description>UTF-8 Unicode</description>
-  <alias>utf-8</alias>
-  <collation name="utf8_test"            id="999">
-    <rules>
-      <reset>A</reset>
-    </rules>
-  </collation>
-</charset>
-</charsets>
-EOF
-
-# Restart the server
--- source include/restart_mysqld.inc
+--echo #
+--echo # Restart the server with a collation with invalid grammar rules.
+--let $restart_parameters=restart:--character-sets-dir=$MYSQL_TEST_DIR/std_data/bug16204175/
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--source include/restart_mysqld.inc
 
 --echo # Check whether the new collation is loaded after restart
 SHOW COLLATION LIKE 'utf8_test';
@@ -587,10 +567,11 @@ CREATE TABLE t1(id INT PRIMARY KEY, c CHAR(1) COLLATE utf8_test);
 call mtr.add_suppression("Shift expected at '' for COLLATION : utf8_test");
 
 # Cleanup
---remove_file $MYSQL_CHARSETSDIR/Index.xml
---copy_file $MYSQLTEST_VARDIR/temp.xml $MYSQL_CHARSETSDIR/Index.xml
---remove_file $MYSQLTEST_VARDIR/temp.xml
--- source include/restart_mysqld.inc
+--echo #
+--echo # Restart server with original character sets dir:
+--let $restart_parameters=restart:--character-sets-dir=$MYSQL_CHARSETSDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
+--source include/restart_mysqld.inc
 
 --echo #
 --echo # End of 5.6 tests