Bug#29492857: LOGGING BUFFERED DURING MYSQL UPGRADE

Followup: Add system level log messages for start/stop of DD upgrade, and flush log for each message. Change the wording of some error messages and added a new message for DD upgrade completion. Change-Id: Ic30c4ce9746c5a0053ad01d0cd3f6d8b8af551c0

Author: ssorumgard

share/errmsg-utf8.txt

@@ -11907,7 +11907,7 @@ ER_DD_UPGRADE_FAILED_FIND_VALID_DATA_DIR
  eng "Failed to find valid data directory."
 
 ER_DD_UPGRADE_START
- eng "Starting upgrade on data directory."
+ eng "Starting upgrade of data directory."
 
 ER_DD_UPGRADE_FAILED_INIT_DD_SE
  eng "Failed to initialize DD Storage Engine."
@@ -19024,7 +19024,7 @@ ER_SERVER_UPGRADE_FAILED
  eng "Failed to upgrade server."
 
 ER_SERVER_UPGRADE_STATUS
- eng "Server upgrade from %d to %d has %s."
+ eng "Server upgrade from '%d' to '%d' %s."
 
 ER_SERVER_UPGRADE_REPAIR_REQUIRED
  eng "Table '%s' requires repair."
@@ -19112,6 +19112,16 @@ ER_WILDCARD_NOT_ALLOWED_FOR_MULTIADDRESS_BIND
 
 ER_NETWORK_NAMESPACE_FILE_PATH_TOO_LONG
  eng "The path to a special network namespace file is too long. (got %u > max %u)"
+
+ER_IB_MSG_TOO_LONG_PATH
+ eng "Cannot create tablespace '%s'. The filepath is too long for this OS."
+
+ER_IB_RECV_FIRST_REC_GROUP_INVALID
+ eng "The last block of redo had corrupted first_rec_group and became fixed (%u -> %u)."
+
+ER_DD_UPGRADE_COMPLETED
+ eng "Data dictionary upgrade from version '%u' to '%u' completed."
+
 #
 # End of 8.0 error messages intended to be logged to the server error log.
 #

sql/dd/impl/bootstrap/bootstrapper.cc

@@ -1191,8 +1191,10 @@ bool initialize_dd_properties(THD *thd) {
  If none of the above, then this must be DD upgrade or server
  upgrade, or both.
  */
- if (bootstrap::DD_bootstrap_ctx::instance().is_dd_upgrade())
- LogErr(INFORMATION_LEVEL, ER_DD_UPGRADE, actual_version, dd::DD_VERSION);
+ if (bootstrap::DD_bootstrap_ctx::instance().is_dd_upgrade()) {
+ LogErr(SYSTEM_LEVEL, ER_DD_UPGRADE, actual_version, dd::DD_VERSION);
+ log_sink_buffer_check_timeout();
+ }
  if (bootstrap::DD_bootstrap_ctx::instance().is_server_upgrade()) {
  // This condition is hit only if upgrade has been skipped before
  if (opt_upgrade_mode == UPGRADE_NONE) {

sql/dd/impl/upgrade/dd.cc

@@ -945,6 +945,11 @@ bool upgrade_tables(THD *thd) {
  update_versions(thd, false))
  return true;
 
+ LogErr(SYSTEM_LEVEL, ER_DD_UPGRADE_COMPLETED,
+ bootstrap::DD_bootstrap_ctx::instance().get_actual_dd_version(),
+ dd::DD_VERSION);
+ log_sink_buffer_check_timeout();
+
  /*
  Flush tables, reset the shared dictionary cache and the storage adapter.
  Start over DD bootstrap from the beginning.

sql/dd/impl/upgrade/server.cc

@@ -893,6 +893,8 @@ bool upgrade_system_schemas(THD *thd) {
 
  LogErr(SYSTEM_LEVEL, ER_SERVER_UPGRADE_STATUS, server_version,
  MYSQL_VERSION_ID, "started");
+ log_sink_buffer_check_timeout();
+
  bootstrap_error_handler.set_log_error(false);
  bool err =
  fix_mysql_tables(thd) || check_and_fix_sys_schema(thd) ||
@@ -912,6 +914,7 @@ bool upgrade_system_schemas(THD *thd) {
  if (!err)
  LogErr(SYSTEM_LEVEL, ER_SERVER_UPGRADE_STATUS, server_version,
  MYSQL_VERSION_ID, "completed");
+ log_sink_buffer_check_timeout();
 
  /*
  * During server startup, dd::reset_tables_and_tablespaces is called, which