summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2011-05-06 00:16:20 +0100
committerLuis Soares <luis.soares@oracle.com>2011-05-06 00:16:20 +0100
commitf2fa301586ddf191ba16ff20122a90398ed9fadb (patch)
tree490b6214776025e83f0788c217312b03badfafbb /sql
parente7dc2b0a3c6c6ab832d928470ccb2a300a92947d (diff)
parentdf07595dc76a5bf0ab3eb156fabf81f2394d3547 (diff)
downloadmariadb-git-f2fa301586ddf191ba16ff20122a90398ed9fadb.tar.gz
BUG#12425924
Automerging cset into latest mysql-5.5.
Diffstat (limited to 'sql')
-rw-r--r--sql/rpl_handler.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/rpl_handler.h b/sql/rpl_handler.h
index bf207e53e2d..9a181250efc 100644
--- a/sql/rpl_handler.h
+++ b/sql/rpl_handler.h
@@ -73,7 +73,10 @@ public:
while (info && info->observer != observer)
info= iter++;
if (info)
+ {
iter.remove();
+ delete info;
+ }
else
ret= TRUE;
unlock();