database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-02 02:22:16 +03:00
parent 5eed6cc55d 4e8d1c6bf3
commit 665100b69d
311 changed files with 7149 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_trigger.cc
View File

@@ -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) ||