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/rpl_mi.h | |
| 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/rpl_mi.h')
| -rw-r--r-- | sql/rpl_mi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index 6dd9fab7904..c4ca5714306 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -119,7 +119,9 @@ int init_master_info(Master_info* mi, const char* master_info_fname, bool abort_if_no_master_info_file, int thread_mask); void end_master_info(Master_info* mi); -int flush_master_info(Master_info* mi, bool flush_relay_log_cache); +int flush_master_info(Master_info* mi, + bool flush_relay_log_cache, + bool need_lock_relay_log); int change_master_server_id_cmp(ulong *id1, ulong *id2); #endif /* HAVE_REPLICATION */ |