diff options
| author | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-09-14 09:12:47 +0500 |
|---|---|---|
| committer | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-09-14 09:12:47 +0500 |
| commit | 474779937b2e3c5ad8ff58b6a97af21dde0141bc (patch) | |
| tree | 675f76ed44e10cc3a6790ad57b049fdfa0401895 /sql/sql_repl.cc | |
| parent | 2a664ff6c200a7bfe5feee7aec7b1650dab8ccff (diff) | |
| parent | f8fdc3bcb006a603b4bc38fb52d027cd94544438 (diff) | |
| download | mariadb-git-474779937b2e3c5ad8ff58b6a97af21dde0141bc.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b20471v2
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 963c4ccf5a6..2a7ab55b8c4 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1359,10 +1359,14 @@ int show_binlogs(THD* thd) MYSQL_TYPE_LONGLONG)); if (protocol->send_fields(&field_list, 1)) DBUG_RETURN(1); + + 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); |