diff options
| author | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-04-20 23:35:53 +0100 |
|---|---|---|
| committer | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-04-20 23:35:53 +0100 |
| commit | 8ac39aa8e0230206fbdf303f1a73655774290bca (patch) | |
| tree | 99feffdbf4a45c2da0724742e1fafe70911cd735 /sql/sql_repl.cc | |
| parent | 2786a6e232106838029c68fdeab75aca675b3920 (diff) | |
| parent | ca33df20942cc50f8038e9cd0ecc846330ebc8ce (diff) | |
| download | mariadb-git-8ac39aa8e0230206fbdf303f1a73655774290bca.tar.gz | |
BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER
Merge from 5.1 into 5.5.
Conflicts:
* sql/log.h
* sql/sql_repl.cc
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 9cad81ac7ab..ffc7aa4bf8a 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1737,6 +1737,8 @@ bool mysql_show_binlog_events(THD* thd) File file = -1; MYSQL_BIN_LOG *binary_log= NULL; int old_max_allowed_packet= thd->variables.max_allowed_packet; + LOG_INFO linfo; + DBUG_ENTER("mysql_show_binlog_events"); Log_event::init_show_field_list(&field_list); @@ -1779,7 +1781,6 @@ bool mysql_show_binlog_events(THD* thd) char search_file_name[FN_REFLEN], *name; const char *log_file_name = lex_mi->log_file_name; mysql_mutex_t *log_lock = binary_log->get_log_lock(); - LOG_INFO linfo; Log_event* ev; unit->set_limit(thd->lex->current_select); @@ -1871,6 +1872,8 @@ bool mysql_show_binlog_events(THD* thd) mysql_mutex_unlock(log_lock); } + // Check that linfo is still on the function scope. + DEBUG_SYNC(thd, "after_show_binlog_events"); ret= FALSE; |