mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Make a stab at events_bugs.test failure under valgrind (no
open bug report, reproduced in the runtime team tree).
This commit is contained in:
@@ -1913,6 +1913,11 @@ Event_job_data::execute(THD *thd, bool drop)
|
||||
thd->variables.sql_mode= sql_mode;
|
||||
thd->variables.time_zone= time_zone;
|
||||
|
||||
/*
|
||||
Peculiar initialization order is a clutch to avoid races in SHOW
|
||||
PROCESSLIST which reads thd->{query/query_length} without a mutex.
|
||||
*/
|
||||
thd->query_length= 0;
|
||||
thd->query= sp_sql.c_ptr_safe();
|
||||
thd->query_length= sp_sql.length();
|
||||
|
||||
@@ -1968,6 +1973,11 @@ end:
|
||||
ret= 1;
|
||||
else
|
||||
{
|
||||
/*
|
||||
Peculiar initialization order is a clutch to avoid races in SHOW
|
||||
PROCESSLIST which reads thd->{query/query_length} without a mutex.
|
||||
*/
|
||||
thd->query_length= 0;
|
||||
thd->query= sp_sql.c_ptr_safe();
|
||||
thd->query_length= sp_sql.length();
|
||||
if (Events::drop_event(thd, dbname, name, FALSE))
|
||||
|
||||
Reference in New Issue
Block a user