diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-14 12:00:08 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-14 12:00:08 +0300 |
| commit | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (patch) | |
| tree | ab2b90f11bcd60035fe1b57f6779dc30f9207360 /sql/sp_head.cc | |
| parent | 50561ab0108dcb427ba0975f11dcab3e20b05612 (diff) | |
| parent | 253d7f25010552a97b603ed5129e3abd5b966426 (diff) | |
| download | mariadb-git-a6165accb3279fe64b672fa0eeaa30ef12cf6557.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 6e69b2e39a4..dd761490753 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1,4 +1,4 @@ -/* Copyright 2002-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* Copyright 2002-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1767,9 +1767,9 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, as one select and not resetting THD::user_var_events before each invocation. */ - pthread_mutex_lock(&LOCK_thread_count); + mysql_mutex_lock(&LOCK_thread_count); q= global_query_id; - pthread_mutex_unlock(&LOCK_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); mysql_bin_log.start_union_events(thd, q + 1); binlog_save_options= thd->variables.option_bits; thd->variables.option_bits&= ~OPTION_BIN_LOG; |