Bug#31789964: HELP TABLES UPGRADE FAILS ENTIRE SERVER UPGRADE - WITHOUT PRINTING ERROR...

PROBLEM:
--------
When we attempt to upgrade existing help tables which had
the older DEFAULT CHARSET=latin1, the upgrade fails when
attempting to populate the help tables, due to the character
set mismatch.

FIX:
----
The appropriate ALTER TABLE statements are added to
mysql_system_tables_fix.sql to convert help tables to utf8
during upgrade.

Note: Additional error messages are not added for this
particular failure as it should no longer occur and thus
would not be logged.

Change-Id: Ieaa90e9be2d9b750642021eb291ca7b1311f5c87

Author: Nischal-Tonthanahal

mysql-test/r/upgrade_system_tables.result

@@ -0,0 +1,12 @@
+# Copy the 5.7 data zip file to working directory and check it exists.
+# Unzip 5.7 data directory.
+# Set data directory and log file
+# Restart server to trigger upgrade.
+# Upgrade of help tables should succeed.
+# restart: --datadir=MYSQLD_DATADIR1 --log-error=MYSQLD_LOG
+# Check for errors in the error log.
+Pattern "\[ERROR\]" not found
+# Check for mysql_upgrade_info file in data directory.
+# Cleanup.
+# Restart the server with default options.
+# restart

mysql-test/std_data/upgrade/data_57_help_tables.zip

@@ -0,0 +1,58 @@
+--source include/have_case_sensitive_file_system.inc
+
+###############################################################################
+#
+# Bug#31789964	: HELP TABLES UPGRADE FAILS ENTIRE SERVER UPGRADE - WITHOUT
+#                PRINTING ERROR...
+#
+###############################################################################
+#   To create the file std_data/upgrade/data_57_help_tables.zip
+#
+#   - In 5.7, execute:
+#
+#       CREATE SCHEMA test;
+#       ALTER TABLE mysql.help_topic    CONVERT TO CHARACTER SET latin1;
+#       ALTER TABLE mysql.help_category CONVERT TO CHARACTER SET latin1;
+#       ALTER TABLE mysql.help_relation CONVERT TO CHARACTER SET latin1;
+#       ALTER TABLE mysql.help_keyword  CONVERT TO CHARACTER SET latin1;
+#
+#   - then zip the data folder
+#
+#       zip -r data_57_help_tables.zip db/
+#
+###############################################################################
+
+--echo # Copy the 5.7 data zip file to working directory and check it exists.
+--copy_file $MYSQLTEST_VARDIR/std_data/upgrade/data_57_help_tables.zip $MYSQL_TMP_DIR/data_57_help_tables.zip
+--file_exists $MYSQL_TMP_DIR/data_57_help_tables.zip
+
+--echo # Unzip 5.7 data directory.
+--exec unzip -qo $MYSQL_TMP_DIR/data_57_help_tables.zip -d $MYSQL_TMP_DIR/data_57_help_tables
+
+--echo # Set data directory and log file
+--let $MYSQLD_DATADIR1= $MYSQL_TMP_DIR/data_57_help_tables/db
+--let $MYSQLD_LOG= $MYSQLTEST_VARDIR/log/data_57_help_tables.log
+
+--echo # Restart server to trigger upgrade.
+--echo # Upgrade of help tables should succeed.
+
+--replace_result $MYSQLD MYSQLD $MYSQLD_DATADIR1 MYSQLD_DATADIR1 $MYSQLD_LOG MYSQLD_LOG
+--let $restart_parameters = restart: --datadir=$MYSQLD_DATADIR1 --log-error=$MYSQLD_LOG
+--let $wait_counter= 10000
+--source include/restart_mysqld.inc
+
+--echo # Check for errors in the error log.
+--let SEARCH_FILE= $MYSQLD_LOG
+--let SEARCH_PATTERN= \[ERROR\]
+--source include/search_pattern.inc
+
+--echo # Check for mysql_upgrade_info file in data directory.
+--file_exists $MYSQLD_DATADIR1/mysql_upgrade_info
+
+--echo # Cleanup.
+--remove_file $MYSQL_TMP_DIR/data_57_help_tables.zip
+--force-rmdir $MYSQL_TMP_DIR/data_57_help_tables
+
+--echo # Restart the server with default options.
+--let $restart_parameters=
+--source include/restart_mysqld.inc

mysql-test/t/upgrade_system_tables.test

@@ -989,6 +989,14 @@ SET GLOBAL automatic_sp_privileges = @global_automatic_sp_privileges;
 ALTER TABLE help_category MODIFY url TEXT NOT NULL;
 ALTER TABLE help_topic MODIFY url TEXT NOT NULL;
 
+--
+-- Upgrade help tables character set to utf8
+--
+ALTER TABLE help_topic CONVERT TO CHARACTER SET utf8;
+ALTER TABLE help_category CONVERT TO CHARACTER SET utf8;
+ALTER TABLE help_relation CONVERT TO CHARACTER SET utf8;
+ALTER TABLE help_keyword CONVERT TO CHARACTER SET utf8;
+
 --
 -- Upgrade a table engine from MyISAM to InnoDB for the system tables
 -- help_topic, help_category, help_relation, help_keyword, plugin, servers,