diff options
| author | unknown <guilhem@mysql.com> | 2004-06-10 15:10:44 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-10 15:10:44 +0200 |
| commit | 2dd4d17ebc0a4fe1617357e570e91512f6a33fcb (patch) | |
| tree | a91daf7e1c6af7277db9b31d273ea2e7e5501713 | |
| parent | 1a0f012aa6b14aff04586843f3d4cfbc0c89df54 (diff) | |
| parent | 6f36366700a442e487c98a936b6754f81fa63a3b (diff) | |
| download | mariadb-git-2dd4d17ebc0a4fe1617357e570e91512f6a33fcb.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1595
| -rw-r--r-- | sql/repl_failsafe.cc | 5 | ||||
| -rw-r--r-- | sql/slave.cc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 2a5381ae478..4feb24f06b2 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -63,6 +63,11 @@ static Slave_log_event* find_slave_event(IO_CACHE* log, static int init_failsafe_rpl_thread(THD* thd) { DBUG_ENTER("init_failsafe_rpl_thread"); + /* + thd->bootstrap is to report errors barely to stderr; if this code is + enable again one day, one should check if bootstrap is still needed (maybe + this thread has no other error reporting method). + */ thd->system_thread = thd->bootstrap = 1; thd->host_or_ip= ""; thd->client_capabilities = 0; diff --git a/sql/slave.cc b/sql/slave.cc index a9b598d73db..1a59e5b2b5b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2516,7 +2516,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) DBUG_ENTER("init_slave_thread"); thd->system_thread = (thd_type == SLAVE_THD_SQL) ? SYSTEM_THREAD_SLAVE_SQL : SYSTEM_THREAD_SLAVE_IO; - thd->bootstrap= 1; thd->host_or_ip= ""; thd->client_capabilities = 0; my_net_init(&thd->net, 0); |