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/repl_failsafe.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/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 720e82f414e..356ec80608c 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -921,8 +921,8 @@ int load_master_data(THD* thd) */ int error; - 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, ER_MASTER_INFO); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); |