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

BUG#11893288 60542: RPL.RPL_EXTRA_COL_MASTER_* DOESN'T TEST WHAT WAS INTENDED

Browse Source 
Test extra/rpl_tests/rpl_extra_col_master.test (used by
rpl_extra_col_master_*) ends with the active connection pointing to the
slave. Thus, the two last tests never succeed in changing the binlog
format of the master away from 'row'. With correct active connection
(master) tests fail for binlog 'statement' and 'mixed' formats.

Tests rpl_extra_col_master_* only run when binary log format is
row.  Statement and mix replication do not make sense in this
tests since it will try to execute statements on columns that do
not exist.  This fix is basically a backport from mysql-5.5, see
changes done as part of BUG 39934.
This commit is contained in:
Nuno Carvalho 2012-01-16 09:17:40 +00:00
parent 97e0eeb364
commit bffc7ec82e
5 changed files with 9 additions and 3503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
View File

@ -59,6 +59,8 @@
#VARCHAR(M)
#
--let $_saved_conn= $CURRENT_CONNECTION
let $binformat = `SHOW VARIABLES LIKE '%binlog_format%'`;
--echo
--echo ***********************************************************
@ -1018,3 +1020,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
connection master;
DROP TABLE t5;
sync_slave_with_master;
--connection $_saved_conn

1743
mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
View File

File diff suppressed because it is too large Load Diff

1743
mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
View File

File diff suppressed because it is too large Load Diff

12
mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
View File

@ -1,17 +1,11 @@
#############################################################
# Purpose: To test having extra columns on the master WL#3915
#############################################################
-- source include/master-slave.inc
-- source include/have_binlog_format_row.inc
-- source include/have_innodb.inc
-- source include/master-slave.inc
let $engine_type = 'InnoDB';
--source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=row;
-- source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=statement;
-- source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=mixed;
-- source extra/rpl_tests/rpl_extra_col_master.test
--source include/rpl_end.inc

10
mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
View File

@ -1,16 +1,10 @@
#############################################################
# Purpose: To test having extra columns on the master WL#3915
#############################################################
-- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
let $engine_type = 'MyISAM';
--source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=row;
-- source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=statement;
-- source extra/rpl_tests/rpl_extra_col_master.test
set binlog_format=mixed;
-- source extra/rpl_tests/rpl_extra_col_master.test
--source include/rpl_end.inc