database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug#29363

Browse Source 
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
  removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
  updated result file
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  updated result file
mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test:
  skip test for row/statement
mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test:
  skip test for row/statement
This commit is contained in:
unknown
2007-06-29 21:09:00 +04:00
parent 575bb5add2
commit eb36fd9735
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc
View File

@ -67,7 +67,7 @@ ALTER TABLE t2 DROP COLUMN d;
--echo
--echo ******************** SHOW BINLOG EVENTS ********************
--replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/
--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/
show binlog events from 1;
sync_slave_with_master;
# as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID

4
mysql-test/suite/rpl/include/rpl_mixed_dml.inc
View File

@ -326,8 +326,8 @@ DROP VIEW v2;
--echo
--echo ******************** SHOW BINLOG EVENTS ********************
--replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/
show binlog events from 102;
--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/
show binlog events from 1;
sync_slave_with_master;
# as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test_rpl > $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql

2
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
View File

@ -138,7 +138,7 @@ ALTER TABLE t2 DROP COLUMN d;
******************** SHOW BINLOG EVENTS ********************
show binlog events from 1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: 5.1.16-beta-debug-log, Binlog ver: 4
master-bin.000001 # Format_desc 1 # Server ver: #
master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test_rpl
master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test_rpl_1
master-bin.000001 # Query 1 # CREATE DATABASE test_rpl_1 CHARACTER SET utf8 COLLATE utf8_general_ci

12
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
View File

@ -684,11 +684,12 @@ CREATE EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELET
==========MASTER==========
SHOW EVENTS;
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e1 root@localhost RECURRING NULL 1 SECOND # # ENABLED
test_rpl e1 root@localhost SYSTEM RECURRING NULL 1 # # NULL ENABLED 1
==========SLAVE===========
USE test_rpl;
SHOW EVENTS;
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e1 @ SYSTEM RECURRING NULL 1 # # NULL SLAVESIDE_DISABLED 1
==========MASTER==========
SELECT COUNT(*) FROM t1;
COUNT(*)
@ -743,11 +744,12 @@ ALTER EVENT e1 RENAME TO e2;
==========MASTER==========
SHOW EVENTS;
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e2 root@localhost RECURRING NULL 1 SECOND # # ENABLED
test_rpl e2 root@localhost SYSTEM RECURRING NULL 1 # # NULL ENABLED 1
==========SLAVE===========
USE test_rpl;
SHOW EVENTS;
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e2 @ SYSTEM RECURRING NULL 1 # # NULL SLAVESIDE_DISABLED 1
==========MASTER==========
SELECT COUNT(*) FROM t1;
COUNT(*)
@ -827,8 +829,9 @@ DELETE FROM t2;
******************** SHOW BINLOG EVENTS ********************
show binlog events from 102;
show binlog events from 1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: #
master-bin.000001 # Query 1 # CREATE DATABASE test_rpl
master-bin.000001 # Query 1 # use `test_rpl`; CREATE TABLE t1 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
master-bin.000001 # Query 1 # use `test_rpl`; CREATE TABLE t2 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
@ -1011,6 +1014,9 @@ master-bin.000001 # Query 1 # use `test_rpl`; DROP TRIGGER tr1
master-bin.000001 # Query 1 # use `test_rpl`; GRANT EVENT ON *.* TO 'root'@'localhost'
master-bin.000001 # Query 1 # use `test_rpl`; INSERT INTO t1 VALUES(1, 'test1')
master-bin.000001 # Xid 1 # #
master-bin.000001 # Query 1 # use `test_rpl`; CREATE EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELETE FROM t1
master-bin.000001 # Query 1 # use `test_rpl`; ALTER EVENT e1 RENAME TO e2
master-bin.000001 # Query 1 # use `test_rpl`; DROP EVENT e2
master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1
master-bin.000001 # Xid 1 # #
master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t2

3
mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
View File

@ -5,9 +5,10 @@
# Requirements: define binlog format for mysqld as in example below:
# ./mysql-test-run.pl --mysqld=--binlog-format=mixed
#########################################
--source include/have_binlog_format_mixed.inc
--source include/have_innodb.inc
let $engine_type= innodb;
--source suite/rpl/include/rpl_mixed_ddl.inc
# End 5.1 Test Case

3
mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
View File

@ -5,9 +5,10 @@
# Requirements: define binlog format for mysqld as in example below:
# ./mysql-test-run.pl --mysqld=--binlog-format=mixed
#########################################
--source include/have_binlog_format_mixed.inc
--source include/have_innodb.inc
let $engine_type= innodb;
--source suite/rpl/include/rpl_mixed_dml.inc
# End 5.1 Test Case