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/repl_failsafe.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/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 5f67143065b..f759be59ffb 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -917,8 +917,8 @@ bool 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))) my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0)); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); |