Commit 68c8fbac authored by unknown's avatar unknown

More safe flush_horizon variable initialization.

parent 55ee6100
...@@ -7500,8 +7500,6 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn) ...@@ -7500,8 +7500,6 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn)
DBUG_ASSERT(translog_status == TRANSLOG_OK || DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY); translog_status == TRANSLOG_READONLY);
LINT_INIT(sent_to_disk); LINT_INIT(sent_to_disk);
LINT_INIT(flush_horizon);
pthread_mutex_lock(&log_descriptor.log_flush_lock); pthread_mutex_lock(&log_descriptor.log_flush_lock);
DBUG_PRINT("info", ("Everything is flushed up to (%lu,0x%lx)", DBUG_PRINT("info", ("Everything is flushed up to (%lu,0x%lx)",
...@@ -7526,6 +7524,7 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn) ...@@ -7526,6 +7524,7 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn)
log_descriptor.next_pass_max_lsn= LSN_IMPOSSIBLE; log_descriptor.next_pass_max_lsn= LSN_IMPOSSIBLE;
} }
log_descriptor.flush_in_progress= 1; log_descriptor.flush_in_progress= 1;
flush_horizon= log_descriptor.previous_flush_horizon;
DBUG_PRINT("info", ("flush_in_progress is set")); DBUG_PRINT("info", ("flush_in_progress is set"));
pthread_mutex_unlock(&log_descriptor.log_flush_lock); pthread_mutex_unlock(&log_descriptor.log_flush_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment