diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 13:46:56 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 13:46:56 +0200 |
| commit | 14bebaa2dcbea89c5deb66eef8e4f07bdfbd9f93 (patch) | |
| tree | fef84ee30cc67f08a1ac7d27909fe21b378a244e /sql/sql_repl.cc | |
| parent | b931e3ebad93999f418364dd6e7f05bafee663b2 (diff) | |
| parent | d2d605e4ea578cf49adb52ebd834363962d099d8 (diff) | |
| download | mariadb-git-14bebaa2dcbea89c5deb66eef8e4f07bdfbd9f93.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
sql/log.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
merge
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index ccda69522c7..e1933d42f9e 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1494,10 +1494,14 @@ bool show_binlogs(THD* thd) if (protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); + + pthread_mutex_lock(mysql_bin_log.get_log_lock()); mysql_bin_log.lock_index(); index_file=mysql_bin_log.get_index_file(); - - mysql_bin_log.get_current_log(&cur); + + mysql_bin_log.raw_get_current_log(&cur); // dont take mutex + pthread_mutex_unlock(mysql_bin_log.get_log_lock()); // lockdep, OK + cur_dir_len= dirname_length(cur.log_file_name); reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0); |