Fix Bug#27508095 UPGRADING FROM 5.6.39 TO 8.0.4 OR 8.0.5 GENERATES A

SERVER ASSERTION

Reviewed-by: Sunny Bains <[email protected]>

Author: Jimmy Yang

share/errmsg-utf8.txt

@@ -17809,6 +17809,9 @@ ER_IB_MSG_1269
 ER_IB_MSG_1270
   eng "%s"
 
+ER_IB_MSG_1271
+  eng "Cannot upgrade server earlier than 5.7 to 8.0"
+
 ER_RPL_SLAVE_SQL_THREAD_STOP_CMD_EXEC_TIMEOUT
   eng "STOP SLAVE command execution is incomplete: Slave SQL thread got the stop signal, thread is busy, SQL thread will stop once the current task is complete."
 

storage/innobase/dict/dict0dict.cc

@@ -7167,16 +7167,24 @@ void dict_upgrade_evict_tables_cache() {
 
 /** Build the table_id array of SYS_* tables. This
 array is used to determine if a table is InnoDB SYSTEM
-table or not. */
-void dict_sys_table_id_build() {
+table or not.
+@return true if successful, false otherwise */
+bool dict_sys_table_id_build() {
   mutex_enter(&dict_sys->mutex);
   for (uint32_t i = 0; i < SYS_NUM_SYSTEM_TABLES; i++) {
     dict_table_t *system_table = dict_table_get_low(SYSTEM_TABLE_NAME[i]);
 
-    ut_a(system_table != nullptr);
+    if (system_table == nullptr) {
+      /* Cannot find a system table, this happens only if user trying
+      to boot server earlier than 5.7 */
+      mutex_exit(&dict_sys->mutex);
+      LogErr(ERROR_LEVEL, ER_IB_MSG_1271);
+      return (false);
+    }
     dict_sys_table_id[i] = system_table->id;
   }
   mutex_exit(&dict_sys->mutex);
+  return (true);
 }
 
 /** @return true if table is InnoDB SYS_* table

storage/innobase/handler/ha_innodb.cc

@@ -4417,7 +4417,9 @@ static int innobase_init_files(dict_init_mode_t dict_init_mode,
   }
 
   if (srv_is_upgrade_mode) {
-    dict_sys_table_id_build();
+    if (!dict_sys_table_id_build()) {
+      DBUG_RETURN(innodb_init_abort());
+    }
     /* Disable AHI when we start loading tables for purge.
     These tables are evicted anyway after purge. */
 

storage/innobase/include/dict0dict.h

@@ -1720,8 +1720,9 @@ bool dict_table_is_system(table_id_t table_id);
 
 /** Build the table_id array of SYS_* tables. This
 array is used to determine if a table is InnoDB SYSTEM
-table or not. */
-void dict_sys_table_id_build();
+table or not.
+@return true if successful, false otherwise */
+bool dict_sys_table_id_build();
 
 /** Change the table_id of SYS_* tables if they have been created after
 an earlier upgrade. This will update the table_id by adding DICT_MAX_DD_TABLES