mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51
This commit is contained in:
@@ -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,10 +288,14 @@ end:
|
||||
FALSE);
|
||||
mysql_bin_log.write(&qinfo);
|
||||
}
|
||||
|
||||
send_ok(thd);
|
||||
}
|
||||
|
||||
VOID(pthread_mutex_unlock(&LOCK_open));
|
||||
start_waiting_global_read_lock(thd);
|
||||
|
||||
if (!result)
|
||||
send_ok(thd);
|
||||
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user