diff options
| author | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
| commit | c4dbf1e969253f3b65106036af0f47a600a77ad5 (patch) | |
| tree | dbd5eed33a764e82c97cd90f56cdda2eb22fef63 /sql/sql_repl.cc | |
| parent | 32c3009d3a8bd1a0ea591977cf878795625e592c (diff) | |
| parent | 467c481479ac511cc445b9703260e9b3bb8b2e96 (diff) | |
| download | mariadb-git-c4dbf1e969253f3b65106036af0f47a600a77ad5.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/repl_failsafe.cc:
Merging 4.0 and 4.1 changes.
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 a84b63c270b..bbcea537ff1 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -683,7 +683,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) { @@ -978,7 +979,8 @@ int 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)) { send_error(thd, ER_MASTER_INFO); unlock_slave_threads(mi); |