diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-07-30 21:58:26 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-07-30 21:58:26 +0300 |
| commit | 7019d450fd6b4b9659401e3ae71dc29d6e1dc996 (patch) | |
| tree | 42d5d7edeb15a888a88076cef0864e220c7ebe37 /sql | |
| parent | 2936bfd220472609a02de93537ac60c767164e82 (diff) | |
| download | mariadb-git-7019d450fd6b4b9659401e3ae71dc29d6e1dc996.tar.gz | |
Fixed wrong usage of global_query_id. (It's not protected by LOCK_thread_count)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 73218b4fda8..d51242c56bc 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1887,9 +1887,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, as one select and not resetting THD::user_var_events before each invocation. */ - mysql_mutex_lock(&LOCK_thread_count); - q= global_query_id; - mysql_mutex_unlock(&LOCK_thread_count); + q= get_query_id(); mysql_bin_log.start_union_events(thd, q + 1); binlog_save_options= thd->variables.option_bits; thd->variables.option_bits&= ~OPTION_BIN_LOG; |