summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-07-03 23:17:53 -0400
committerunknown <cmiller@zippy.(none)>2006-07-03 23:17:53 -0400
commit2ef57b836248f945657c7bd0fe02fa7fe3660b54 (patch)
treefebbd8fda4772ca5f079e2e8ab9f859d058f665a /mysql-test/r
parentf49ef0c3a8d78726471bd3d5397c0397d05fd271 (diff)
downloadmariadb-git-2ef57b836248f945657c7bd0fe02fa7fe3660b54.tar.gz
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.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl_row_create_table.result20
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result
index f314aa39b81..2f6fcc5c5ea 100644
--- a/mysql-test/r/rpl_row_create_table.result
+++ b/mysql-test/r/rpl_row_create_table.result
@@ -137,11 +137,11 @@ a b
1 2
2 4
3 6
-SHOW BINLOG EVENTS FROM 1256;
+SHOW BINLOG EVENTS FROM 1118;
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 1356 Table_map 1 1396 table_id: # (test.t7)
-master-bin.000001 1396 Write_rows 1 1452 table_id: # flags: STMT_END_F
+master-bin.000001 1118 Query 1 1218 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
+master-bin.000001 1218 Table_map 1 1258 table_id: # (test.t7)
+master-bin.000001 1258 Write_rows 1 1314 table_id: # flags: STMT_END_F
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
@@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4;
ROLLBACK;
Warnings:
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
-master-bin.000001 1452 Table_map 1 1492 table_id: # (test.t7)
-master-bin.000001 1492 Write_rows 1 1548 table_id: # flags: STMT_END_F
+master-bin.000001 1314 Table_map 1 1354 table_id: # (test.t7)
+master-bin.000001 1354 Write_rows 1 1410 table_id: # flags: STMT_END_F
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
@@ -191,10 +191,10 @@ Create Table CREATE TABLE `t9` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) 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
-master-bin.000001 1548 Query 1 1634 use `test`; CREATE TABLE t8 LIKE t4
-master-bin.000001 1634 Query 1 1773 use `test`; CREATE TABLE `t9` (
+master-bin.000001 1410 Query 1 1496 use `test`; CREATE TABLE t8 LIKE t4
+master-bin.000001 1496 Query 1 1635 use `test`; CREATE TABLE `t9` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
)