diff options
| author | unknown <monty@mysql.com> | 2004-03-10 13:48:41 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-10 13:48:41 +0200 |
| commit | b2147e25639c20494820f5ca409e6efb8dd7e497 (patch) | |
| tree | 9661f231066d4a9738d67cf3a8dc0f5a2f7b53ea /sql/repl_failsafe.cc | |
| parent | 0f4c30de7d514714108a898e3bae88dda001f40f (diff) | |
| parent | 221397cdbefcb9ed455694637419bb2d3b84ae6e (diff) | |
| download | mariadb-git-b2147e25639c20494820f5ca409e6efb8dd7e497.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 6599516044a..61d4cee4c09 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -920,7 +920,7 @@ int load_master_data(THD* thd) active_mi->rli.master_log_pos = active_mi->master_log_pos; strmake(active_mi->rli.master_log_name,active_mi->master_log_name, sizeof(active_mi->rli.master_log_name)-1); - flush_relay_log_info(&active_mi->rli); + flush_relay_log_info(&active_mi->rli, 0); pthread_cond_broadcast(&active_mi->rli.data_cond); pthread_mutex_unlock(&active_mi->rli.data_lock); thd->proc_info = "starting slave"; |