diff options
author | mkindahl@dl145h.mysql.com <> | 2008-02-12 18:21:17 +0100 |
---|---|---|
committer | mkindahl@dl145h.mysql.com <> | 2008-02-12 18:21:17 +0100 |
commit | a3fe485dfe8443065d5b2d4f078b8607c473ff12 (patch) | |
tree | 3867d79f7d0c2a500a0217b154f81a0b1b773186 /sql | |
parent | e91c287ead6b762831b78a5b76435e8ff1c703bd (diff) | |
download | mariadb-git-a3fe485dfe8443065d5b2d4f078b8607c473ff12.tar.gz |
Various fixes to fix memory leaks after merging replication
tree with main.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_binlog.cc | 1 | ||||
-rw-r--r-- | sql/sql_class.cc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index cff4ceeccf9..462806ab10d 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -234,6 +234,7 @@ void mysql_client_binlog_statement(THD* thd) send_ok(thd); end: + thd->rli_fake->clear_tables_to_lock(); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); DBUG_VOID_RETURN; } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5180cafc774..044ea70e994 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -870,7 +870,10 @@ THD::~THD() #endif #ifndef EMBEDDED_LIBRARY if (rli_fake) + { delete rli_fake; + rli_fake= NULL; + } #endif free_root(&main_mem_root, MYF(0)); |