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

merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1

Browse Source
This commit is contained in:
Alfranio Correia
2009-12-17 21:43:35 +00:00
parent e852131f04 e83c9f6273
commit 3dadf9564c
288 changed files with 52852 additions and 11629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/rpl/t/rpl_trigger.test
View File

@ -5,7 +5,9 @@
--source include/have_binlog_format_mixed_or_statement.inc
--source include/master-slave.inc
CALL mtr.add_suppression("Statement may not be safe to log in statement format.");
disable_query_log;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
enable_query_log;
--disable_warnings
DROP TABLE IF EXISTS t1;
@ -518,7 +520,9 @@ create trigger tr
for each row insert into log values ( new.f );
set autocommit = 0;
--disable_warnings
insert into t1 values ( 1 );
--enable_warnings
rollback;
sync_slave_with_master;