database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/engines/funcs/t/disabled.def
  - mysql-test/suite/engines/iuds/t/disabled.def
  - mysql-test/suite/engines/iuds/t/insert_number.test
This commit is contained in:
Alexander Nozdrin
2010-05-07 13:37:16 +04:00
parent 21b8741b57 7af6ac8f3e
commit 762b535de2
222 changed files with 5498 additions and 5233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
View File

@@ -3,10 +3,10 @@ source include/have_innodb.inc;
source include/have_binlog_format_statement.inc;
connection slave;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
connection master;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @@session.binlog_direct_non_transactional_updates= FALSE;