diff options
| author | unknown <mats@mysql.com> | 2004-11-25 09:26:45 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2004-11-25 09:26:45 +0100 |
| commit | 6f2cf12aa63a3b88ebf363576550ec5ae4954978 (patch) | |
| tree | 2a950449e3650d6c0857e79a0a83cc2595692170 /sql/repl_failsafe.cc | |
| parent | 442b2d89b1992dd727eae1c59c16499d052ceb54 (diff) | |
| download | mariadb-git-6f2cf12aa63a3b88ebf363576550ec5ae4954978.tar.gz | |
Fix for Bug#6148. Only rewind read position in binary log when the
slave SQL thread is started.
sql/slave.cc:
Adding threads to init as parameter to init_master_info.
Only rewind read position when starting SQL thread.
sql/slave.h:
Adding threads to init as parameter to init_master_info.
Only rewind read position when starting SQL thread.
sql/sql_repl.cc:
Adding threads to init as parameter to init_master_info.
Only rewind read position when starting SQL thread.
sql/repl_failsafe.cc:
Adding threads to init as parameter to init_master_info.
Only rewind read position when starting SQL thread.
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 9fa6ea843f1..84640fbc968 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -892,7 +892,8 @@ int load_master_data(THD* thd) setting active_mi, because init_master_info() sets active_mi with defaults. */ - if (init_master_info(active_mi, master_info_file, relay_log_info_file, 0)) + if (init_master_info(active_mi, master_info_file, relay_log_info_file, + 0, (SLAVE_IO | SLAVE_SQL))) send_error(&thd->net, ER_MASTER_INFO); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); |