diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
| commit | fb0ee3ab8ed62428d4b92f4134dcdee6a66fd0c6 (patch) | |
| tree | 9909bd321761de0c8085748ac06b4a431906e670 /sql/sp_head.cc | |
| parent | 0f90f1dee7b45d47d3e1e77f66e4af74c795370f (diff) | |
| parent | 9c820e637e886d0b67384e04107e4ca3f53f990b (diff) | |
| download | mariadb-git-fb0ee3ab8ed62428d4b92f4134dcdee6a66fd0c6.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/sql_insert.cc
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 d4931de23e8..9996a237cb4 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 @@ -1768,9 +1768,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; |