database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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

2
mysql-test/t/mysqlbinlog.test
View File

@ -5,7 +5,7 @@
-- source include/have_log_bin.inc
--disable_query_log
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");
--enable_query_log
# Deletes all the binary logs