Bug#29492857: LOGGING BUFFERED DURING MYSQL UPGRADE

The patch for Bug#29189532 implemented explicit flush requests from the clients, but the timeout limits still prevented immediate flushing from happening. This patch ignores the timeout limit when an explicit request for flush is submitted. The patch also adds a couple of additional flush requests. Change-Id: I8ee278eca42b753f2f7287e5dd9bc76a5f86f6f9 Reviewed-by: Tatjana Nuernberg <tatjana.nuernberg@oracle.com>

Author: ssorumgard

components/mysql_server/log_builtins.cc

@@ -1449,7 +1449,8 @@ static int log_sink_buffer(void *instance MY_ATTRIBUTE((unused)),
  // Buffering very first event; set up initial time-out ...
  log_buffering_timeout =
  now + (LOG_BUFFERING_TIMEOUT_AFTER * LOG_BUFFERING_TIME_SCALE);
- else if (now > log_buffering_timeout) {
+
+ if (now > log_buffering_timeout || ll == nullptr) {
  // We timed out. Flush, and set up new, possibly shorter subsequent timeout.
 
  /*

sql/dd/upgrade_57/upgrade.cc

@@ -573,7 +573,8 @@ bool add_sdi_info(THD *thd) {
  if (Upgrade_status().update(Upgrade_status::enum_stage::SDI_INFO_UPDATED))
  return true;
 
- LogErr(INFORMATION_LEVEL, ER_DD_UPGRADE_DD_POPULATED);
+ LogErr(SYSTEM_LEVEL, ER_DD_UPGRADE_DD_POPULATED);
+ log_sink_buffer_check_timeout();
 
  return false;
 } // add_sdi_info
@@ -890,7 +891,8 @@ bool do_pre_checks_and_initialize_dd(THD *thd) {
  If mysql.idb does not exist and updgrade stage tracking file
  does not exist, we are in upgrade mode.
  */
- LogErr(INFORMATION_LEVEL, ER_DD_UPGRADE_START);
+ LogErr(SYSTEM_LEVEL, ER_DD_UPGRADE_START);
+ log_sink_buffer_check_timeout();
  }
 
  /*