diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-03 18:24:28 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-03 18:24:28 -0500 |
| commit | bd2cc79a95993f088a82c2bc5ccd1ba647bd1c2d (patch) | |
| tree | 4377783fbb5881088a2e6f6feef7948db014eb3a /sql/repl_failsafe.cc | |
| parent | 2e99ee900ac48cfb406f88b9418bfd99a55d3f55 (diff) | |
| parent | 66dfd85cf4d55e6d87e8bb81b8fc8450eb9b3f67 (diff) | |
| download | mariadb-git-bd2cc79a95993f088a82c2bc5ccd1ba647bd1c2d.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
BitKeeper/etc/collapsed:
auto-union
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 6 |
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)) |