database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl

Browse Source 
into  mysql.com:/home/bar/mysql-5.0.b24478
This commit is contained in:
bar@mysql.com
2007-02-27 12:46:50 +04:00
parent e9481608c3 8f97dea5f8
commit 75177d9cf8
5 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_parse.cc
View File

@@ -32,6 +32,7 @@
#include "sp_head.h"
#include "sp.h"
#include "sp_cache.h"
#include "sql_trigger.h"
#ifdef HAVE_OPENSSL
/*
@@ -2491,6 +2492,30 @@ mysql_execute_command(THD *thd)
#ifdef HAVE_REPLICATION
if (unlikely(thd->slave_thread))
{
if (lex->sql_command == SQLCOM_DROP_TRIGGER)
{
/*
When dropping a trigger, we need to load its table name
before checking slave filter rules.
*/
add_table_for_trigger(thd, thd->lex->spname, 1, &all_tables);
if (!all_tables)
{
/*
If table name cannot be loaded,
it means the trigger does not exists possibly because
CREATE TRIGGER was previously skipped for this trigger
according to slave filtering rules.
Returning success without producing any errors in this case.
*/
DBUG_RETURN(0);
}
// force searching in slave.cc:tables_ok()
all_tables->updating= 1;
}
/*
Check if statment should be skipped because of slave filtering
rules