database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

MDEV-5047 virtual THD::~THD(): Assertion `status_var.memory_used == 0' fails

Browse Source 
- Don't forget to delete the query plan footprint when 
  the query wasn't printed into slow query log for some reason
- ALso removed some garbage code.
This commit is contained in:
Sergey Petrunya
2013-09-23 14:17:56 +04:00
parent d998a1635f
commit ccca339459
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_parse.cc
View File

@@ -1525,6 +1525,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
/*
@note
This function must call delete_qpf_query().
*/
void log_slow_statement(THD *thd)
{
DBUG_ENTER("log_slow_statement");
@@ -1543,7 +1547,10 @@ void log_slow_statement(THD *thd)
if (!thd->enable_slow_log ||
(thd->variables.log_slow_filter
&& !(thd->variables.log_slow_filter & thd->query_plan_flags)))
{
delete_qpf_query(thd->lex);
DBUG_VOID_RETURN;
}
if (((thd->server_status & SERVER_QUERY_WAS_SLOW) ||
((thd->server_status &
@@ -4799,13 +4806,7 @@ finish:
#endif
}
lex->unit.cleanup();
//psergey-todo: print EXPLAIN here? After the above JOIN::cleanup calls?
// how do we print EXPLAIN extended, then?
if (lex->describe)
{
DBUG_ASSERT(lex->query_plan_footprint);
///..
}
/* Free tables */
thd_proc_info(thd, "closing tables");
close_thread_tables(thd);