1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-10-13 08:57:15 -04:00
10 changed files with 188 additions and 129 deletions

View File

@ -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,10 +282,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);
}