diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2004-11-26 13:44:49 +0000 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2004-11-26 13:44:49 +0000 |
| commit | 97c8234b46497ff59ba0951f3ea272d63b7eeadf (patch) | |
| tree | c7ac4c11ee0cfec1ed32d3fecc46d396019403e3 /sql/sql_repl.cc | |
| parent | f92dac8d2ec8412c1a4c7997cd5912230ba7d00a (diff) | |
| parent | 19dab11881e900c9e79db570b2f6456f67aa23fb (diff) | |
| download | mariadb-git-97c8234b46497ff59ba0951f3ea272d63b7eeadf.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d2e3e72618d..0d1a7f3890d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -779,7 +779,8 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) thread_mask&= thd->lex->slave_thd_opt; if (thread_mask) //some threads are stopped, start them { - if (init_master_info(mi,master_info_file,relay_log_info_file, 0)) + if (init_master_info(mi,master_info_file,relay_log_info_file, 0, + thread_mask)) slave_errno=ER_MASTER_INFO; else if (server_id_supplied && *mi->host) { @@ -1074,7 +1075,8 @@ bool change_master(THD* thd, MASTER_INFO* mi) thd->proc_info = "Changing master"; LEX_MASTER_INFO* lex_mi= &thd->lex->mi; // TODO: see if needs re-write - if (init_master_info(mi, master_info_file, relay_log_info_file, 0)) + if (init_master_info(mi, master_info_file, relay_log_info_file, 0, + thread_mask)) { my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0)); unlock_slave_threads(mi); |