File tree 3 files changed +1
-35
lines changed
3 files changed +1
-35
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ ER_RPL_GTID_TABLE_CANNOT_OPEN
105
105
ER_SYSTEM_SCHEMA_NOT_FOUND
106
106
eng "System schema directory does not exist."
107
107
108
- ER_DD_INIT_UPGRADE_FAILED
108
+ OBSOLETE_ER_DD_INIT_UPGRADE_FAILED
109
109
eng "Error in initializing dictionary, upgrade will do a cleanup and exit"
110
110
111
111
ER_VIEW_UNKNOWN_CHARSET_OR_COLLATION
Original file line number Diff line number Diff line change @@ -968,30 +968,6 @@ bool restart_dictionary(THD *thd) {
968
968
return false ;
969
969
}
970
970
971
- // Initialize dictionary in case of server restart.
972
- void recover_innodb_upon_upgrade (THD *thd) {
973
- Dictionary_impl *d = dd::Dictionary_impl::instance ();
974
- store_predefined_tablespace_metadata (thd);
975
- // RAII to handle error in execution of CREATE TABLE.
976
- Key_length_error_handler key_error_handler;
977
- /*
978
- Ignore ER_TOO_LONG_KEY for dictionary tables during restart.
979
- Do not print the error in error log as we are creating only the
980
- cached objects and not physical tables.
981
- TODO: Workaround due to bug#20629014. Remove when the bug is fixed.
982
- */
983
- thd->push_internal_handler (&key_error_handler);
984
- if (create_dd_schema (thd) || initialize_dd_properties (thd) ||
985
- create_tables (thd, nullptr ) ||
986
- DDSE_dict_recover (thd, DICT_RECOVERY_RESTART_SERVER,
987
- d->get_actual_dd_version (thd))) {
988
- // Error is not be handled in this case as we are on cleanup code path.
989
- LogErr (WARNING_LEVEL, ER_DD_INIT_UPGRADE_FAILED);
990
- }
991
- thd->pop_internal_handler ();
992
- return ;
993
- }
994
-
995
971
bool setup_dd_objects_and_collations (THD *thd) {
996
972
// Continue with server startup.
997
973
bootstrap::DD_bootstrap_ctx::instance ().set_stage (
Original file line number Diff line number Diff line change @@ -233,16 +233,6 @@ bool store_plugin_IS_table_metadata(THD *thd);
233
233
*/
234
234
bool setup_dd_objects_and_collations (THD *thd);
235
235
236
- /* *
237
- This function is used in case of crash during upgrade.
238
- It tries to initialize dictionary and calls DDSE_dict_recover.
239
- InnoDB should do the recovery and empty undo log. Upgrade
240
- process will do the cleanup and exit.
241
-
242
- @param thd Thread context.
243
- */
244
- void recover_innodb_upon_upgrade (THD *thd);
245
-
246
236
/* *
247
237
Initialize InnoDB for
248
238
- creating new data directory : InnoDB creates system tablespace and
You can’t perform that action at this time.
0 commit comments