Commit 8c6526d6 authored by marko's avatar marko

branches/zip: srv_master_thread(): Remove unnecessary assignments to

n_pages_purged.
parent 1d2380cb
...@@ -2177,7 +2177,7 @@ srv_master_thread( ...@@ -2177,7 +2177,7 @@ srv_master_thread(
time_t last_flush_time; time_t last_flush_time;
time_t current_time; time_t current_time;
ulint old_activity_count; ulint old_activity_count;
ulint n_pages_purged; ulint n_pages_purged = 0;
ulint n_bytes_merged; ulint n_bytes_merged;
ulint n_pages_flushed; ulint n_pages_flushed;
ulint n_bytes_archived; ulint n_bytes_archived;
...@@ -2347,11 +2347,9 @@ srv_master_thread( ...@@ -2347,11 +2347,9 @@ srv_master_thread(
/* We run a full purge every 10 seconds, even if the server /* We run a full purge every 10 seconds, even if the server
were active */ were active */
n_pages_purged = 1;
last_flush_time = time(NULL); last_flush_time = time(NULL);
while (n_pages_purged) { do {
if (srv_fast_shutdown && srv_shutdown_state > 0) { if (srv_fast_shutdown && srv_shutdown_state > 0) {
...@@ -2369,7 +2367,7 @@ srv_master_thread( ...@@ -2369,7 +2367,7 @@ srv_master_thread(
log_buffer_flush_to_disk(); log_buffer_flush_to_disk();
last_flush_time = current_time; last_flush_time = current_time;
} }
} } while (n_pages_purged);
srv_main_thread_op_info = "flushing buffer pool pages"; srv_main_thread_op_info = "flushing buffer pool pages";
...@@ -2440,11 +2438,9 @@ srv_master_thread( ...@@ -2440,11 +2438,9 @@ srv_master_thread(
/* Run a full purge */ /* Run a full purge */
n_pages_purged = 1;
last_flush_time = time(NULL); last_flush_time = time(NULL);
while (n_pages_purged) { do {
if (srv_fast_shutdown && srv_shutdown_state > 0) { if (srv_fast_shutdown && srv_shutdown_state > 0) {
break; break;
...@@ -2461,7 +2457,7 @@ srv_master_thread( ...@@ -2461,7 +2457,7 @@ srv_master_thread(
log_buffer_flush_to_disk(); log_buffer_flush_to_disk();
last_flush_time = current_time; last_flush_time = current_time;
} }
} } while (n_pages_purged);
srv_main_thread_op_info = "reserving kernel mutex"; srv_main_thread_op_info = "reserving kernel mutex";
......
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