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

Addendum to bug 27417: poor test results fixes.

Browse Source 
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Addendum to bug 27417: removed tests for another bug
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Addendum to bug 27417: removed tests for another bug
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Addendum to bug 27417: changes to non-transactional tables 
  should be logged even on rollback.
This commit is contained in:
unknown 2007-07-31 18:04:05 +03:00
parent 1f6088cc8b
commit 31e33aba7b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
View File

@ -463,10 +463,6 @@ insert into t2 select bug27417(2);
reset master; reset master;
insert into t2 values (bug27417(2)); insert into t2 values (bug27417(2));
ERROR 23000: Duplicate entry '2' for key 'PRIMARY' ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 218
/* only (!) with fixes for #23333 will show there is the query */;
select count(*) from t1 /* must be 3 */; select count(*) from t1 /* must be 3 */;
count(*) count(*)
3 3
@ -478,10 +474,6 @@ delete from t2 where a=bug27417(3);
select count(*) from t2 /* nothing got deleted */; select count(*) from t2 /* nothing got deleted */;
count(*) count(*)
2 2
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 223
/* the query must be in regardless of #23333 */;
select count(*) from t1 /* must be 5 */; select count(*) from t1 /* must be 5 */;
count(*) count(*)
5 5

6
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
View File

@ -123,14 +123,16 @@ reset master;
--error ER_DUP_ENTRY --error ER_DUP_ENTRY
insert into t2 values (bug27417(2)); insert into t2 values (bug27417(2));
show master status; /* only (!) with fixes for #23333 will show there is the query */; #TODO: Andrei: enable this test after 23333 is pushed
#show master status; /* only (!) with fixes for #23333 will show there is the query */;
select count(*) from t1 /* must be 3 */; select count(*) from t1 /* must be 3 */;
reset master; reset master;
select count(*) from t2; select count(*) from t2;
delete from t2 where a=bug27417(3); delete from t2 where a=bug27417(3);
select count(*) from t2 /* nothing got deleted */; select count(*) from t2 /* nothing got deleted */;
show master status; /* the query must be in regardless of #23333 */; #TODO: Andrei: enable this test after 23333 is pushed
#show master status; /* the query must be in regardless of #23333 */;
select count(*) from t1 /* must be 5 */; select count(*) from t1 /* must be 5 */;
--enable_info --enable_info

8
mysql-test/suite/rpl/r/rpl_row_create_table.result
View File

@ -392,12 +392,20 @@ FROM t1
WHERE a MOD 2 = 1; WHERE a MOD 2 = 1;
INSERT INTO t2 SELECT a+2 FROM tt2; INSERT INTO t2 SELECT a+2 FROM tt2;
ROLLBACK; ROLLBACK;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
a a
SHOW BINLOG EVENTS FROM 631; SHOW BINLOG EVENTS FROM 631;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
# 631 Query # 711 use `test`; TRUNCATE TABLE t2 # 631 Query # 711 use `test`; TRUNCATE TABLE t2
# 711 Xid # 738 COMMIT /* XID */ # 711 Xid # 738 COMMIT /* XID */
# 738 Query # 806 use `test`; BEGIN
# 806 Table_map # 845 table_id: # (test.t2)
# 845 Write_rows # 889 table_id: # flags: STMT_END_F
# 889 Table_map # 928 table_id: # (test.t2)
# 928 Write_rows # 967 table_id: # flags: STMT_END_F
# 967 Query # 1038 use `test`; ROLLBACK
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
a a
DROP TABLE t1,t2; DROP TABLE t1,t2;