Commit e95a62a7 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/slave.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge
parents 683c1e6a 92e7cf15

mysql-test/r/rpl_replicate_do.result

+34 −0
Original line number Diff line number Diff line
@@ -41,3 +41,37 @@ select * from t1; 
ts

2005-08-12 00:00:00

drop table t1;

*** master ***

create table t1 (a int, b int);

create trigger trg1 before insert on t1 for each row set new.b=2;

create table t2 (a int, b int);

create trigger trg2 before insert on t2 for each row set new.b=2;

show tables;

Tables_in_test

t1

t2

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	set new.b=2	BEFORE	NULL		root@localhost

trg2	INSERT	t2	set new.b=2	BEFORE	NULL		root@localhost

*** slave ***

show tables;

Tables_in_test

t1

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	set new.b=2	BEFORE	NULL		root@localhost

*** master ***

drop trigger trg1;

drop trigger trg2;

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

*** slave ***

show tables;

Tables_in_test

t1

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

*** master ***

drop table t1;

drop table t2;

mysql-test/t/rpl_replicate_do.test

+32 −0
Original line number Diff line number Diff line
@@ -58,3 +58,35 @@ drop table t1; 
sync_slave_with_master;



# End of 4.1 tests



#

# Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters

#

--echo *** master ***

connection master;

create table t1 (a int, b int);

create trigger trg1 before insert on t1 for each row set new.b=2;

create table t2 (a int, b int);

create trigger trg2 before insert on t2 for each row set new.b=2;

show tables;

show triggers;

sync_slave_with_master;

--echo *** slave ***

connection slave;

show tables;

show triggers;

--echo *** master ***

connection master;

drop trigger trg1;

drop trigger trg2;

show triggers;

sync_slave_with_master;

--echo *** slave ***

connection slave;

show tables;

show triggers;

--echo *** master ***

connection master;

drop table t1;

drop table t2;

sync_slave_with_master;

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void net_set_read_timeout(NET *net, uint timeout); 
#define WARN_DEPRECATED(Thd,Ver,Old,New)                                             \

  do {                                                                               \

    DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0);              \

    if (Thd != NULL)                                                                 \

    if (((gptr)Thd) != NULL)                                                         \

      push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN,                \

                        ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX),    \

                        (Old), (Ver), (New));                                        \