summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
diff options
context:
space:
mode:
authorunknown <dlenev@brandersnatch.localdomain>2004-09-09 23:44:27 +0400
committerunknown <dlenev@brandersnatch.localdomain>2004-09-09 23:44:27 +0400
commit97cbcbb0d7414c4bbb33fdf8a0a5bc90662cc7dc (patch)
tree7de0eaaaa031a9f34c5cd97f3cf0a5a82e3ea13d /sql/sql_trigger.cc
parenteb75a9fd8dc7d22b2e7f3de5abbdecb25a464f9f (diff)
downloadmariadb-git-97cbcbb0d7414c4bbb33fdf8a0a5bc90662cc7dc.tar.gz
After merge fixes for WL#1218 "Triggers"
mysql-test/t/trigger.test: After merge fix, error codes corrected. sql/sp_head.cc: After mrege fix. Fixed typo. sql/sql_trigger.cc: After merge fix. wait_if_gloabl_read_lock has one more argument now.
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 56294b9bc80..c376e86f18c 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -88,7 +88,7 @@ int mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
again until we are done. (Acquiring LOCK_open is not enough because
global read lock is held without helding LOCK_open).
*/
- if (wait_if_global_read_lock(thd, 0))
+ if (wait_if_global_read_lock(thd, 0, 0))
DBUG_RETURN(-1);
VOID(pthread_mutex_lock(&LOCK_open));