From 7c472868af278cf5725d3a3f94c7f6c905386c06 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 May 2007 15:35:18 +0400 Subject: [PATCH] Make a stab at events_bugs.test failure under valgrind (no open bug report, reproduced in the runtime team tree). sql/event_data_objects.cc: Make a stub at fixing a race in event_bugs.test under valgrind: read of uninitialized byte in SHOW PROCESSLIST from an event thread. --- sql/event_data_objects.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 4b788a8f7d8..41f2f89db24 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -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))