Commit 36ca5c0d authored by unknown's avatar unknown

Change word order of a few PROCESSLIST messages to correspond

to order used in START SLAVE syntax.


sql/log.cc:
  Change word order.
sql/slave.cc:
  Change word order.
parent 77210169
...@@ -1692,7 +1692,7 @@ void MYSQL_LOG:: wait_for_update(THD* thd, bool master_or_slave) ...@@ -1692,7 +1692,7 @@ void MYSQL_LOG:: wait_for_update(THD* thd, bool master_or_slave)
const char* old_msg = thd->enter_cond(&update_cond, &LOCK_log, const char* old_msg = thd->enter_cond(&update_cond, &LOCK_log,
master_or_slave ? master_or_slave ?
"Has read all relay log; waiting for \ "Has read all relay log; waiting for \
the I/O slave thread to update it" : the slave I/O thread to update it" :
"Has sent all binlog to slave; \ "Has sent all binlog to slave; \
waiting for binlog to be updated"); waiting for binlog to be updated");
pthread_cond_wait(&update_cond, &LOCK_log); pthread_cond_wait(&update_cond, &LOCK_log);
......
...@@ -1579,7 +1579,7 @@ static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) ...@@ -1579,7 +1579,7 @@ static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
save_proc_info= thd->enter_cond(&rli->log_space_cond, save_proc_info= thd->enter_cond(&rli->log_space_cond,
&rli->log_space_lock, &rli->log_space_lock,
"\ "\
Waiting for the SQL slave thread to free enough relay log space"); Waiting for the slave SQL thread to free enough relay log space");
while (rli->log_space_limit < rli->log_space_total && while (rli->log_space_limit < rli->log_space_total &&
!(slave_killed=io_slave_killed(thd,mi)) && !(slave_killed=io_slave_killed(thd,mi)) &&
!rli->ignore_log_space_limit) !rli->ignore_log_space_limit)
...@@ -2291,7 +2291,7 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, ...@@ -2291,7 +2291,7 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
DBUG_PRINT("info",("Waiting for master update")); DBUG_PRINT("info",("Waiting for master update"));
const char* msg = thd->enter_cond(&data_cond, &data_lock, const char* msg = thd->enter_cond(&data_cond, &data_lock,
"Waiting for the SQL slave thread to \ "Waiting for the slave SQL thread to \
advance position"); advance position");
/* /*
We are going to pthread_cond_(timed)wait(); if the SQL thread stops it We are going to pthread_cond_(timed)wait(); if the SQL thread stops it
......
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