mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
Renumber events to make tests pass. This must be a result of removing extraneous
COMMITs -- the numbers collapse to fill the gaps. mysql-test/r/rpl_row_create_table.result: Renumber event position. This must be a result of extraneous COMMITs; see Bug#16206. I don't fully understand this, but I can't see any harm to it. mysql-test/t/rpl_row_create_table.test: Renumber event position. This must be a result of extraneous COMMITs; see Bug#16206. I don't fully understand this, but I can't see any harm to it.
This commit is contained in:
parent
f49ef0c3a8
commit
2ef57b8362
2 changed files with 13 additions and 13 deletions
|
@ -137,11 +137,11 @@ a b
|
||||||
1 2
|
1 2
|
||||||
2 4
|
2 4
|
||||||
3 6
|
3 6
|
||||||
SHOW BINLOG EVENTS FROM 1256;
|
SHOW BINLOG EVENTS FROM 1118;
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
Log_name Pos Event_type Server_id End_log_pos Info
|
||||||
master-bin.000001 1256 Query 1 1356 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
|
master-bin.000001 1118 Query 1 1218 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
|
||||||
master-bin.000001 1356 Table_map 1 1396 table_id: # (test.t7)
|
master-bin.000001 1218 Table_map 1 1258 table_id: # (test.t7)
|
||||||
master-bin.000001 1396 Write_rows 1 1452 table_id: # flags: STMT_END_F
|
master-bin.000001 1258 Write_rows 1 1314 table_id: # flags: STMT_END_F
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
a b
|
a b
|
||||||
1 2
|
1 2
|
||||||
|
@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4;
|
||||||
ROLLBACK;
|
ROLLBACK;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
||||||
SHOW BINLOG EVENTS FROM 1452;
|
SHOW BINLOG EVENTS FROM 1314;
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
Log_name Pos Event_type Server_id End_log_pos Info
|
||||||
master-bin.000001 1452 Table_map 1 1492 table_id: # (test.t7)
|
master-bin.000001 1314 Table_map 1 1354 table_id: # (test.t7)
|
||||||
master-bin.000001 1492 Write_rows 1 1548 table_id: # flags: STMT_END_F
|
master-bin.000001 1354 Write_rows 1 1410 table_id: # flags: STMT_END_F
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
a b
|
a b
|
||||||
1 2
|
1 2
|
||||||
|
@ -191,10 +191,10 @@ Create Table CREATE TABLE `t9` (
|
||||||
`a` int(11) DEFAULT NULL,
|
`a` int(11) DEFAULT NULL,
|
||||||
`b` int(11) DEFAULT NULL
|
`b` int(11) DEFAULT NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
SHOW BINLOG EVENTS FROM 1548;
|
SHOW BINLOG EVENTS FROM 1410;
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
Log_name Pos Event_type Server_id End_log_pos Info
|
||||||
master-bin.000001 1548 Query 1 1634 use `test`; CREATE TABLE t8 LIKE t4
|
master-bin.000001 1410 Query 1 1496 use `test`; CREATE TABLE t8 LIKE t4
|
||||||
master-bin.000001 1634 Query 1 1773 use `test`; CREATE TABLE `t9` (
|
master-bin.000001 1496 Query 1 1635 use `test`; CREATE TABLE `t9` (
|
||||||
`a` int(11) DEFAULT NULL,
|
`a` int(11) DEFAULT NULL,
|
||||||
`b` int(11) DEFAULT NULL
|
`b` int(11) DEFAULT NULL
|
||||||
)
|
)
|
||||||
|
|
|
@ -76,7 +76,7 @@ INSERT INTO t7 SELECT a,b FROM tt3;
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
# Should be written to the binary log
|
# Should be written to the binary log
|
||||||
--replace_regex /table_id: [0-9]+/table_id: #/
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
||||||
SHOW BINLOG EVENTS FROM 1256;
|
SHOW BINLOG EVENTS FROM 1118;
|
||||||
sync_slave_with_master;
|
sync_slave_with_master;
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ BEGIN;
|
||||||
INSERT INTO t7 SELECT a,b FROM tt4;
|
INSERT INTO t7 SELECT a,b FROM tt4;
|
||||||
ROLLBACK;
|
ROLLBACK;
|
||||||
--replace_regex /table_id: [0-9]+/table_id: #/
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
||||||
SHOW BINLOG EVENTS FROM 1452;
|
SHOW BINLOG EVENTS FROM 1314;
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
sync_slave_with_master;
|
sync_slave_with_master;
|
||||||
SELECT * FROM t7 ORDER BY a,b;
|
SELECT * FROM t7 ORDER BY a,b;
|
||||||
|
@ -101,7 +101,7 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4;
|
||||||
--query_vertical SHOW CREATE TABLE t8
|
--query_vertical SHOW CREATE TABLE t8
|
||||||
--query_vertical SHOW CREATE TABLE t9
|
--query_vertical SHOW CREATE TABLE t9
|
||||||
--replace_regex /table_id: [0-9]+/table_id: #/
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
||||||
SHOW BINLOG EVENTS FROM 1548;
|
SHOW BINLOG EVENTS FROM 1410;
|
||||||
sync_slave_with_master;
|
sync_slave_with_master;
|
||||||
--echo **** On Slave ****
|
--echo **** On Slave ****
|
||||||
--query_vertical SHOW CREATE TABLE t8
|
--query_vertical SHOW CREATE TABLE t8
|
||||||
|
|
Loading…
Add table
Reference in a new issue