diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 70225f0f57a0f2e2267e61ec0990099ca21ccea2 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sql_trigger.cc | |
| parent | 86026abddfff15bf787516c698df894155e5277d (diff) | |
| parent | 495ab702dee710fa497aa9355b8f18faab23fab9 (diff) | |
| download | mariadb-git-70225f0f57a0f2e2267e61ec0990099ca21ccea2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 12180d9447c..936265e6753 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2005 MySQL AB +/* Copyright (C) 2004-2005 MySQL AB, 2008-2009 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 @@ -491,11 +491,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) goto end; } - pthread_mutex_lock(&LOCK_open); + mysql_mutex_lock(&LOCK_open); result= (create ? table->triggers->create_trigger(thd, tables, &stmt_query): table->triggers->drop_trigger(thd, tables, &stmt_query)); - pthread_mutex_unlock(&LOCK_open); + mysql_mutex_unlock(&LOCK_open); if (result) goto end; @@ -1891,7 +1891,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, #ifndef DBUG_OFF if (thd->mdl_context.is_lock_owner(MDL_key::TABLE, db, old_table, MDL_EXCLUSIVE)) - safe_mutex_assert_owner(&LOCK_open); + mysql_mutex_assert_owner(&LOCK_open); #endif DBUG_ASSERT(my_strcasecmp(table_alias_charset, db, new_db) || |