diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-10-13 08:57:15 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-10-13 08:57:15 -0400 |
| commit | 87ba07e832af210d7b6ec2bf63bfa04f426e172a (patch) | |
| tree | c9ceeb2739c4460d63cb38192bb4bd37e35b8dec /sql/sql_trigger.cc | |
| parent | c8261b12085abb64e606b573f6b6f91a13f6ed65 (diff) | |
| parent | cd71add6f2cc9753eda90f43545a95b5837c196b (diff) | |
| download | mariadb-git-87ba07e832af210d7b6ec2bf63bfa04f426e172a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index c0c9c34cbeb..706cf79d1d9 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -270,8 +270,6 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) table->triggers->drop_trigger(thd, tables, &stmt_query)); end: - VOID(pthread_mutex_unlock(&LOCK_open)); - start_waiting_global_read_lock(thd); if (!result) { @@ -284,9 +282,13 @@ end: FALSE); mysql_bin_log.write(&qinfo); } + } + + VOID(pthread_mutex_unlock(&LOCK_open)); + start_waiting_global_read_lock(thd); + if (!result) send_ok(thd); - } DBUG_RETURN(result); } |