Skip to content

M
MariaDB
Commit 6ed2c824 authored by Alfranio Correia's avatar Alfranio Correia
Browse files
Options

Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3 

mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result:
  Suppressed warning messages due to unsafe statements.
mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test:
  Suppressed warning messages due to unsafe statements.
mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test:
  Re-enabled some parts of the test after BUG#46572
mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test:
  Re-enabled some parts of the test after BUG#46572
parent 7eb789a7
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 20 deletions
mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
View file @ 6ed2c824
......@@ -19,8 +19,7 @@
--echo #########################################################################
--echo # CONFIGURATION
--echo #########################################################################
#Re-enable this after fixing BUG#46572
#connection master;
connection master;
CREATE TABLE tt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
CREATE TABLE tt_2 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb;
......@@ -353,23 +352,18 @@ SET AUTOCOMMIT= 1;
--echo ###################################################################################
--echo # CHECK CONSISTENCY
--echo ###################################################################################
# Re-enable this after fixing BUG#46572
# #--sync_slave_with_master
#
# #--let $diff_table_1= master:test.tt_1
# #--let $diff_table_2= slave:test.tt_1
# #--source include/diff_tables.inc
#
--sync_slave_with_master
--let $diff_table_1= master:test.tt_1
--let $diff_table_2= slave:test.tt_1
--source include/diff_tables.inc
--echo ###################################################################################
--echo # CLEAN
--echo ###################################################################################
#Re-enable this after fixing BUG#46572
#connection master;
connection master;
DROP TABLE tt_1;
DROP TABLE tt_2;
#Re-enable this after fixing BUG#46572
#sync_slave_with_master;
sync_slave_with_master;
mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
View file @ 6ed2c824
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
#########################################################################
# CONFIGURATION
#########################################################################
......@@ -524,6 +530,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db
###################################################################################
# CHECK CONSISTENCY
###################################################################################
Comparing tables master:test.tt_1 and slave:test.tt_1
###################################################################################
# CLEAN
###################################################################################
DROP TABLE tt_1;
DROP TABLE tt_2;
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
View file @ 6ed2c824
......@@ -4,6 +4,7 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`;
CREATE DATABASE `#mysql50#mysqltest-1`;
Master position is not changed
......
mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
View file @ 6ed2c824
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
#########################################################################
# CONFIGURATION
#########################################################################
......@@ -565,6 +571,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db
###################################################################################
# CHECK CONSISTENCY
###################################################################################
Comparing tables master:test.tt_1 and slave:test.tt_1
###################################################################################
# CLEAN
###################################################################################
DROP TABLE tt_1;
DROP TABLE tt_2;
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
View file @ 6ed2c824
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
#########################################################################
# CONFIGURATION
#########################################################################
......@@ -523,6 +529,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db
###################################################################################
# CHECK CONSISTENCY
###################################################################################
Comparing tables master:test.tt_1 and slave:test.tt_1
###################################################################################
# CLEAN
###################################################################################
DROP TABLE tt_1;
DROP TABLE tt_2;
mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
View file @ 6ed2c824
......@@ -2,8 +2,7 @@
# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
################################################################################
--source include/have_binlog_format_mixed.inc
#Re-enable this after fixing BUG#46572
#--source include/master-slave.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--source extra/rpl_tests/rpl_implicit_commit_binlog.test
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
View file @ 6ed2c824
......@@ -10,6 +10,8 @@
# Only run test if "mysql_upgrade" is found
--source include/have_mysql_upgrade.inc
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
connection master;
--disable_warnings
DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`;
......
mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
View file @ 6ed2c824
......@@ -2,8 +2,7 @@
# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
################################################################################
--source include/have_binlog_format_row.inc
#Re-enable this after fixing BUG#46572
#--source include/master-slave.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--source extra/rpl_tests/rpl_implicit_commit_binlog.test
mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
View file @ 6ed2c824
......@@ -2,8 +2,7 @@
# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
################################################################################
--source include/have_binlog_format_statement.inc
#Re-enable this after fixing BUG#46572
#--source include/master-slave.inc
--source include/master-slave.inc
--source include/have_innodb.inc
--source extra/rpl_tests/rpl_implicit_commit_binlog.test
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7