summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2011-05-04 14:09:54 +0100
committerLuis Soares <luis.soares@oracle.com>2011-05-04 14:09:54 +0100
commitca10c2d2e3f4b4900375788a214b2c2a946e3018 (patch)
treefb0af8c287c60e74036fd08620ba09051f6777e6
parent7b27523b09b8a2f9b028f46a5ff5e1ebf899af09 (diff)
downloadmariadb-git-ca10c2d2e3f4b4900375788a214b2c2a946e3018.tar.gz
Automerged (cherrypicked) cset from 5.6:
zhenxing.he@sun.com-20101117085902-n9gfvlkmm44t38y0 This takes care of valgrind warnings in 5.5 that exhibit the same trace as in BUG#11763879 (BUG#56649).
-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();