diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-11-27 18:11:05 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-11-27 18:11:05 +0100 |
| commit | 566bcab328d05c215ef7f4bddd603e0361f40e72 (patch) | |
| tree | 87365effe6f9f67269ad7c47f5136f34a867ae52 /sql/sp_head.cc | |
| parent | 9ea65e5fa98ad56925d709d853a621de38cf1a71 (diff) | |
| parent | 3c11750e363da6e1017d5bc86e9e7e03b2c4e101 (diff) | |
| download | mariadb-git-566bcab328d05c215ef7f4bddd603e0361f40e72.tar.gz | |
Merge WL#5138 to mysql-next-mr
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index dae4a03c7f5..4943870640b 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1769,9 +1769,9 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, as one select and not resetting THD::user_var_events before each invocation. */ - VOID(pthread_mutex_lock(&LOCK_thread_count)); + pthread_mutex_lock(&LOCK_thread_count); q= global_query_id; - VOID(pthread_mutex_unlock(&LOCK_thread_count)); + pthread_mutex_unlock(&LOCK_thread_count); mysql_bin_log.start_union_events(thd, q + 1); binlog_save_options= thd->options; thd->options&= ~OPTION_BIN_LOG; |