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 | 6dd801d7b7b813382c304f0787709031897af1dc (patch) | |
| tree | d4c383865865c897dc5f361924955f2260e97db1 /sql/sql_repl.cc | |
| parent | ac8e3fee1e88d826e80bc38a8e6813cf2911afb1 (diff) | |
| parent | d0ffa8e51b104839a9e397aacda8ca1f110e3fad (diff) | |
| download | mariadb-git-6dd801d7b7b813382c304f0787709031897af1dc.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/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 1fb0fcaf6dd..fe3f17f57a0 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1522,7 +1522,7 @@ bool change_master(THD* thd, Master_info* mi) Relay log's IO_CACHE may not be inited, if rli->inited==0 (server was never a slave before). */ - if (flush_master_info(mi, 0)) + if (flush_master_info(mi, FALSE, FALSE)) { my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush master info file"); ret= TRUE; |