1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Alfranio Correia 2010-03-31 14:51:52 +01:00
commit 2b48577cc2
6 changed files with 36939 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12125
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result Normal file
View File

File diff suppressed because it is too large Load Diff

13731
mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result Normal file
View File

File diff suppressed because it is too large Load Diff

11040
mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result Normal file
View File

File diff suppressed because it is too large Load Diff

15
mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test Normal file
View File

@ -0,0 +1,15 @@
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
--source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--disable_query_log
SET SESSION binlog_direct_non_transactional_updates = OFF;
--enable_query_log
let $engine_type=Innodb;
--source extra/rpl_tests/rpl_mixing_engines.test
--diff_files suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result suite/rpl/r/rpl_mixed_mixing_engines.result

15
mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test Normal file
View File

@ -0,0 +1,15 @@
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--disable_query_log
SET SESSION binlog_direct_non_transactional_updates = OFF;
--enable_query_log
let $engine_type=Innodb;
--source extra/rpl_tests/rpl_mixing_engines.test
--diff_files suite/rpl/r/rpl_non_direct_row_mixing_engines.result suite/rpl/r/rpl_row_mixing_engines.result

13
mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test Normal file
View File

@ -0,0 +1,13 @@
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
--source include/have_binlog_format_statement.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--disable_query_log
SET SESSION binlog_direct_non_transactional_updates = OFF;
--enable_query_log
let $engine_type=Innodb;
--source extra/rpl_tests/rpl_mixing_engines.test