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 | d3968407e6f8417bf5f5483fb71279fc38e75668 (patch) | |
| tree | 99feffdbf4a45c2da0724742e1fafe70911cd735 /sql/log.h | |
| parent | a7d47adf23a4ac17cc99553cf1e79968ab50e6aa (diff) | |
| parent | cdaae1692b1e74c0fdeaaece82e3350a30e3bbd2 (diff) | |
| download | mariadb-git-d3968407e6f8417bf5f5483fb71279fc38e75668.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/log.h')
| -rw-r--r-- | sql/log.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h index 2e9d308e5e5..6f86d6ca5f8 100644 --- a/sql/log.h +++ b/sql/log.h @@ -151,6 +151,11 @@ class Relay_log_info; extern PSI_mutex_key key_LOG_INFO_lock; #endif +/* + Note that we destroy the lock mutex in the desctructor here. + This means that object instances cannot be destroyed/go out of scope, + until we have reset thd->current_linfo to NULL; + */ typedef struct st_log_info { char log_file_name[FN_REFLEN]; |