database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl

Browse Source 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
This commit is contained in:
lars/lthalmann@dl145k.mysql.com
2007-03-01 15:39:57 +01:00
parent 8bbb520891 c0e985cd58
commit 17d00e3c6b
11 changed files with 104 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_parse.cc
View File

@ -27,6 +27,7 @@
#include "sp_cache.h"
#include "events.h"
#include "event_data_objects.h"
#include "sql_trigger.h"
/* Used in error handling only */
#define SP_TYPE_STRING(LP) \
@ -1596,6 +1597,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