database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge bug11754117-45670 fixes from 5.1.

Browse Source
This commit is contained in:
Andrei Elkin
2012-04-21 13:24:39 +03:00
parent e748999eb5 f3509d1d67
commit bf66e3ab63
18 changed files with 406 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.cc
View File

@ -744,7 +744,7 @@ bool Drop_table_error_handler::handle_condition(THD *thd,
THD::THD()
:Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION,
/* statement id */ 0),
rli_fake(0),
rli_fake(0), rli_slave(NULL),
user_time(0), in_sub_stmt(0),
binlog_unsafe_warning_flags(0),
binlog_table_maps(0),
@ -1359,6 +1359,8 @@ THD::~THD()
}
mysql_audit_free_thd(this);
if (rli_slave)
rli_slave->cleanup_after_session();
#endif
free_root(&main_mem_root, MYF(0));
@ -1678,6 +1680,10 @@ void THD::cleanup_after_query()
{
delete_dynamic(&lex->mi.repl_ignore_server_ids);
}
#ifndef EMBEDDED_LIBRARY
if (rli_slave)
rli_slave->cleanup_after_query();
#endif
}