increment and get the query_id atomically, otherwise two concurrent threads

might end up having the same query id

increment and get the query_id atomically, otherwise two concurrent threads
might end up having the same query id
11d27996 · Sergei Golubchik · afcd7091 · 11d27996
Commit 11d27996 authored Feb 19, 2014 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

sql/sql_parse.cc sql/sql_parse.cc +4 -3

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -917,9 +917,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
  DEBUG_SYNC(thd,"dispatch_command_before_set_time");

  thd->set_time();
-  thd->set_query_id(get_query_id());
-  if (!(server_command_flags[command] & CF_SKIP_QUERY_ID))
-    next_query_id();
+  if (server_command_flags[command] & CF_SKIP_QUERY_ID)
+    thd->set_query_id(get_query_id());
+  else
+    thd->set_query_id(next_query_id());
  inc_thread_running();

  if (!(server_command_flags[command] & CF_SKIP_QUESTIONS))