Plugging memory leak in row-based replication triggered by

test rpl_err_ignoredtables.


sql/log_event.cc:
  Clearing tables to lock list in the event of errors.
  Adding asserts to catch failing to clear the list of tables to lock.
  Releasing allocated memory if the table will not be replicated.
sql/rpl_rli.h:
  Adding assert to ensure post-condition of clear_tables_to_lock().
  Minor rewrites.

1 files changed, 5 insertions, 6 deletions

diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index cacae1aa4c2..99606353080 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -309,15 +309,14 @@ typedef struct st_relay_log_info
 
   void cleanup_context(THD *, bool);
   void clear_tables_to_lock() {
-    TABLE_LIST *ptr= tables_to_lock;
-    while (ptr)
+    while (tables_to_lock)
     {
-      char *to_free= reinterpret_cast<char*>(ptr);
-      ptr= ptr->next_global;
+      char *to_free= reinterpret_cast<gptr>(tables_to_lock);
+      tables_to_lock= tables_to_lock->next_global;
+      tables_to_lock_count--;
       my_free(to_free, MYF(MY_WME));
     }
-    tables_to_lock= 0;
-    tables_to_lock_count= 0;
+    DBUG_ASSERT(tables_to_lock == NULL && tables_to_lock_count == 0);
   }
 
   time_t unsafe_to_stop_at;