summaryrefslogtreecommitdiff
path: root/sql/repl_failsafe.cc
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-03 18:24:28 -0500
committercmiller@zippy.cornsilk.net <>2007-01-03 18:24:28 -0500
commit68428545a59cd0b582a9dc648463e1a04b3c9a6a (patch)
tree4377783fbb5881088a2e6f6feef7948db014eb3a /sql/repl_failsafe.cc
parent499eb4d8bae79220ff461fccc05e25e15629ec88 (diff)
parent10cdf90bd37fe5eb2cb22398520f3c6e8cb693ae (diff)
downloadmariadb-git-68428545a59cd0b582a9dc648463e1a04b3c9a6a.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r--sql/repl_failsafe.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 2cd733db647..88b45caf354 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -91,7 +91,7 @@ static int init_failsafe_rpl_thread(THD* thd)
if (thd->variables.max_join_size == HA_POS_ERROR)
thd->options|= OPTION_BIG_SELECTS;
- thd->proc_info="Thread initialized";
+ THD_PROC_INFO(thd, "Thread initialized");
thd->version=refresh_version;
thd->set_time();
DBUG_RETURN(0);
@@ -597,7 +597,7 @@ pthread_handler_t handle_failsafe_rpl(void *arg)
{
bool break_req_chain = 0;
pthread_cond_wait(&COND_rpl_status, &LOCK_rpl_status);
- thd->proc_info="Processing request";
+ THD_PROC_INFO(thd, "Processing request");
while (!break_req_chain)
{
switch (rpl_status) {
@@ -941,7 +941,7 @@ bool load_master_data(THD* thd)
goto err;
}
}
- thd->proc_info="purging old relay logs";
+ THD_PROC_INFO(thd, "purging old relay logs");
if (purge_relay_logs(&active_mi->rli,thd,
0 /* not only reset, but also reinit */,
&errmsg))