diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-06-16 16:04:30 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-06-16 16:04:30 +0100 |
| commit | 38a3504e7557f6855c2c5c6c63a68fecc3e333dd (patch) | |
| tree | e515a5958fc903a3c834ac3d563d93cfc62e51f2 /sql/slave.cc | |
| parent | 422e834ae118e1de1b1ce1be274a5a3c2e549c3c (diff) | |
| download | mariadb-git-38a3504e7557f6855c2c5c6c63a68fecc3e333dd.tar.gz | |
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
This is a backport of BUG#43076.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index ac371baf522..043b0e3fed5 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1493,6 +1493,8 @@ bool show_master_info(THD* thd, Master_info* mi) pthread_mutex_lock(&mi->data_lock); pthread_mutex_lock(&mi->rli.data_lock); + pthread_mutex_lock(&mi->err_lock); + pthread_mutex_lock(&mi->rli.err_lock); protocol->store(mi->host, &my_charset_bin); protocol->store(mi->user, &my_charset_bin); protocol->store((uint32) mi->port); @@ -1592,6 +1594,8 @@ bool show_master_info(THD* thd, Master_info* mi) // Last_SQL_Error protocol->store(mi->rli.last_error().message, &my_charset_bin); + pthread_mutex_unlock(&mi->rli.err_lock); + pthread_mutex_unlock(&mi->err_lock); pthread_mutex_unlock(&mi->rli.data_lock); pthread_mutex_unlock(&mi->data_lock); |