diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 13:43:34 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 13:43:34 +0200 |
| commit | d2d605e4ea578cf49adb52ebd834363962d099d8 (patch) | |
| tree | 2f11faf90e49ea4e1e47cec032231077bb5adbfd /sql/sql_class.h | |
| parent | 5d82bec5b880a20d537b9c84b9353ae5607bac1d (diff) | |
| download | mariadb-git-d2d605e4ea578cf49adb52ebd834363962d099d8.tar.gz | |
bug#21965 - replication
fix deadlock if master switches log file in parallell with "show master logs"
sql/log.cc:
add raw_get_current_log which dont take log mutex
sql/sql_class.h:
add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
Fix lock order i.e first log_lock then index_lock
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e8fe175cd7c..a995a492bc8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -177,6 +177,7 @@ public: bool need_mutex); int find_next_log(LOG_INFO* linfo, bool need_mutex); int get_current_log(LOG_INFO* linfo); + int raw_get_current_log(LOG_INFO* linfo); uint next_file_id(); inline bool is_open() { return log_type != LOG_CLOSED; } inline char* get_index_fname() { return index_file_name;} |