database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge from maria/5.5 (-rtag:mariadb-5.5.36).

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-02-25 17:49:41 -05:00
parent e36fe045c0 ff2e82f4a1
commit ae6e1548cb
1431 changed files with 6096 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -1087,9 +1087,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))