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-5308 Crash when running with slow_query_log=1

Browse Source 
- Make log_slow_statement() always call delete_explain_query().
This commit is contained in:
Sergey Petrunya
2013-11-21 16:29:46 +04:00
parent 146c8a4874
commit bcd854fe33
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@@ -1554,7 +1554,7 @@ void log_slow_statement(THD *thd)
statement in a trigger or stored function
*/
if (unlikely(thd->in_sub_stmt))
DBUG_VOID_RETURN; // Don't set time for sub stmt
goto end; // Don't set time for sub stmt
/* Follow the slow log filter configuration. */
@@ -1562,8 +1562,7 @@ void log_slow_statement(THD *thd)
(thd->variables.log_slow_filter
&& !(thd->variables.log_slow_filter & thd->query_plan_flags)))
{
delete_explain_query(thd->lex);
DBUG_VOID_RETURN;
goto end;
}
if (((thd->server_status & SERVER_QUERY_WAS_SLOW) ||
@@ -1580,7 +1579,7 @@ void log_slow_statement(THD *thd)
*/
if (thd->variables.log_slow_rate_limit > 1 &&
(global_query_id % thd->variables.log_slow_rate_limit) != 0)
DBUG_VOID_RETURN;
goto end;
thd_proc_info(thd, "logging slow query");
slow_log_print(thd, thd->query(), thd->query_length(),
@@ -1588,6 +1587,7 @@ void log_slow_statement(THD *thd)
thd_proc_info(thd, 0);
}
end:
delete_explain_query(thd->lex);
DBUG_VOID_RETURN;
}