diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-03 17:19:58 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-03 17:19:58 +0000 |
| commit | 90a79ca4ad807241942869f6233b9fedf1ed58fd (patch) | |
| tree | d4c383865865c897dc5f361924955f2260e97db1 /sql/slave.cc | |
| parent | 5d6206d8824a193255786d25dadb8b97376e9141 (diff) | |
| parent | 55aab082a957e3f20e94f791dbe44750b4b465c8 (diff) | |
| download | mariadb-git-90a79ca4ad807241942869f6233b9fedf1ed58fd.tar.gz | |
BUG#50364: manual merge to mysql-next-mr-bugfixing.
Conflicts
=========
Text conflict in sql/repl_failsafe.cc
Additional changes
==================
Replace references to pthread_mutex with mysql_mutex
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index af43b39c63b..c7469d41a26 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -510,7 +510,7 @@ int terminate_slave_threads(Master_info* mi,int thread_mask,bool skip_lock) DBUG_PRINT("info",("Flushing relay log and master info file.")); if (current_thd) thd_proc_info(current_thd, "Flushing relay log and master info files."); - if (flush_master_info(mi, TRUE /* flush relay log */)) + if (flush_master_info(mi, TRUE, FALSE)) DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS); if (my_sync(mi->rli.relay_log.get_log_file()->file, MYF(MY_WME))) @@ -1601,7 +1601,7 @@ static void write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi) " to the relay log, SHOW SLAVE STATUS may be" " inaccurate"); rli->relay_log.harvest_bytes_written(&rli->log_space_total); - if (flush_master_info(mi, 1)) + if (flush_master_info(mi, TRUE, FALSE)) sql_print_error("Failed to flush master info file"); delete ev; } @@ -2928,7 +2928,7 @@ Stopping slave I/O thread due to out-of-memory error from master"); goto err; } - if (flush_master_info(mi, 1)) + if (flush_master_info(mi, TRUE, TRUE)) { sql_print_error("Failed to flush master info file"); goto err; |