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

Automerge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-08-25 01:44:50 +03:00
parent 99b79db5dc a826711789
commit 58a75bb18b
167 changed files with 1625 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/t/binlog_base64_flag.test
View File

@ -7,6 +7,7 @@
# BINLOG statement does not work in embedded mode.
source include/have_log_bin.inc;
source include/not_embedded.inc;
disable_warnings;

1
mysql-test/suite/binlog/t/binlog_old_versions.test
View File

@ -22,6 +22,7 @@
# Related bugs: BUG#27779, BUG#31581, BUG#31582, BUG#31583, BUG#32407
source include/have_log_bin.inc;
source include/not_embedded.inc;
--disable_warnings

2
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
View File

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--loose-innodb_lock_wait_timeout=2

2
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
View File

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--loose-innodb_lock_wait_timeout=2