diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-11 16:49:59 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-11 16:49:59 -0400 |
| commit | 21e525c5aea5618387ad968e878b7aef076b0747 (patch) | |
| tree | be0a74988ae2a39ac3c1d5faddb39b5954a3e0fb /sql/sql_trigger.cc | |
| parent | 247f85f7edc611e4659c2378492fd4474f08f0f6 (diff) | |
| parent | 25393e391be033a1f32b11f4ea1405f427930725 (diff) | |
| download | mariadb-git-21e525c5aea5618387ad968e878b7aef076b0747.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51
BitKeeper/deleted/.del-collapsed~66d21d0d6c19df3d:
Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
'Auto converge'
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_parse.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_view.cc:
Manual merge.
vio/viosocket.c:
Manual merge.
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 acb7d5b61df..b35e126f2c3 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -276,8 +276,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) { @@ -290,9 +288,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); } |