diff options
| author | Pedro Gomes <pedro.gomes@oracle.com> | 2013-02-15 22:18:37 +0000 |
|---|---|---|
| committer | Pedro Gomes <pedro.gomes@oracle.com> | 2013-02-15 22:18:37 +0000 |
| commit | 91e043c304065a5786218f343f08c433faf117b5 (patch) | |
| tree | c0584d4690d763c4e4d28ce67c668124f3b79e07 /sql/log_event.cc | |
| parent | 776b5697958381d751bc8c45ab7413cece2ed7f7 (diff) | |
| parent | 7e8c887786dc76c0057acb5a73ff4355a4ea87b1 (diff) | |
| download | mariadb-git-91e043c304065a5786218f343f08c433faf117b5.tar.gz | |
BUG#13545447: RPL_ROTATE_LOGS FAILS DUE TO CONCURRENCY ISSUES IN REP. CODE
Merge from mysql 5.1 to mysql 5.5
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 3bca6cc3dcf..dfbcecd2db9 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1029,7 +1029,9 @@ bool Log_event::write_header(IO_CACHE* file, ulong event_data_length) */ int Log_event::read_log_event(IO_CACHE* file, String* packet, - mysql_mutex_t* log_lock) + mysql_mutex_t* log_lock, + const char *log_file_name_arg, + bool* is_binlog_active) { ulong data_len; int result=0; @@ -1038,6 +1040,10 @@ int Log_event::read_log_event(IO_CACHE* file, String* packet, if (log_lock) mysql_mutex_lock(log_lock); + + if (log_file_name_arg) + *is_binlog_active= mysql_bin_log.is_active(log_file_name_arg); + if (my_b_read(file, (uchar*) buf, sizeof(buf))) { /* |