mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge

Browse source 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
This commit is contained in:
unknown 2008-02-13 08:07:24 +01:00
commit 62ed949d32
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/sql_binlog.cc
View file

@ -234,6 +234,7 @@ void mysql_client_binlog_statement(THD* thd)
send_ok(thd); send_ok(thd);
end: end:
thd->rli_fake->clear_tables_to_lock();
my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

3
sql/sql_class.cc
View file

@ -870,7 +870,10 @@ THD::~THD()
#endif #endif
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (rli_fake) if (rli_fake)
{
delete rli_fake; delete rli_fake;
rli_fake= NULL;
}
#endif #endif
free_root(&main_mem_root, MYF(0)); free_root(&main_mem_root, MYF(0));