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

Fix mix_innodb_myisam_binlog test and results after merge

Browse Source
This commit is contained in:
jimw@mysql.com
2005-11-17 20:17:49 -08:00
parent f8ce7bc01e
commit 2ff5c55896
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mysql-test/r/mix_innodb_myisam_binlog.result
View File

@ -87,13 +87,12 @@ insert into t2 select * from t1;
select get_lock("a",10); select get_lock("a",10);
get_lock("a",10) get_lock("a",10)
1 1
show binlog events from 79; show binlog events from 98;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 79 Query 1 79 use `test`; BEGIN master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 119 Query 1 79 use `test`; insert into t1 values(8) master-bin.000001 166 Query 1 # use `test`; insert into t1 values(8)
master-bin.000001 178 Query 1 79 use `test`; insert into t2 select * from t1 master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
master-bin.000001 244 Query 1 244 use `test`; ROLLBACK master-bin.000001 347 Query 1 # use `test`; ROLLBACK
master-bin.000001 287 Query 1 287 use `test`; DO RELEASE_LOCK("a")
delete from t1; delete from t1;
delete from t2; delete from t2;
reset master; reset master;
@ -218,6 +217,8 @@ create temporary table t1 (a int) engine=myisam;
commit; commit;
insert t1 values (1); insert t1 values (1);
rollback; rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
create table t0 (n int); create table t0 (n int);
insert t0 select * from t1; insert t0 select * from t1;
set autocommit=1; set autocommit=1;
@ -228,31 +229,30 @@ insert into t2 values (3);
select get_lock("lock1",60); select get_lock("lock1",60);
get_lock("lock1",60) get_lock("lock1",60)
1 1
show binlog events from 79; show binlog events from 98;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 79 Query 1 79 use `test`; BEGIN master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 119 Query 1 79 use `test`; insert into t1 values(16) master-bin.000001 166 Query 1 # use `test`; insert into t1 values(16)
master-bin.000001 179 Query 1 79 use `test`; insert into t1 values(18) master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
master-bin.000001 239 Query 1 239 use `test`; COMMIT master-bin.000001 342 Xid 1 # COMMIT /* xid=105 */
master-bin.000001 280 Query 1 280 use `test`; delete from t1 master-bin.000001 369 Query 1 # use `test`; delete from t1
master-bin.000001 329 Query 1 329 use `test`; delete from t2 master-bin.000001 446 Xid 1 # COMMIT /* xid=114 */
master-bin.000001 378 Query 1 378 use `test`; alter table t2 type=MyISAM master-bin.000001 473 Query 1 # use `test`; delete from t2
master-bin.000001 439 Query 1 439 use `test`; insert into t1 values (1) master-bin.000001 550 Xid 1 # COMMIT /* xid=115 */
master-bin.000001 499 Query 1 499 use `test`; insert into t2 values (20) master-bin.000001 577 Query 1 # use `test`; alter table t2 type=MyISAM
master-bin.000001 560 Query 1 560 use `test`; drop table t1,t2 master-bin.000001 666 Query 1 # use `test`; insert into t1 values (1)
master-bin.000001 611 Query 1 611 use `test`; BEGIN master-bin.000001 754 Xid 1 # COMMIT /* xid=117 */
master-bin.000001 651 Query 1 611 use `test`; create temporary table ti (a int) engine=innodb master-bin.000001 781 Query 1 # use `test`; insert into t2 values (20)
master-bin.000001 733 Query 1 733 use `test`; ROLLBACK master-bin.000001 870 Query 1 # use `test`; drop table t1,t2
master-bin.000001 776 Query 1 776 use `test`; insert into ti values(1) master-bin.000001 949 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
master-bin.000001 835 Query 1 835 use `test`; BEGIN master-bin.000001 1059 Query 1 # use `test`; insert into ti values(1)
master-bin.000001 875 Query 1 835 use `test`; create temporary table t1 (a int) engine=myisam master-bin.000001 1146 Xid 1 # COMMIT /* xid=132 */
master-bin.000001 957 Query 1 957 use `test`; COMMIT master-bin.000001 1173 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
master-bin.000001 998 Query 1 998 use `test`; create table t0 (n int) master-bin.000001 1283 Query 1 # use `test`; insert t1 values (1)
master-bin.000001 1056 Query 1 1056 use `test`; insert t0 select * from t1 master-bin.000001 1366 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 1117 Query 1 1117 use `test`; DO RELEASE_LOCK("a") master-bin.000001 1452 Query 1 # use `test`; insert t0 select * from t1
master-bin.000001 1172 Query 1 1172 use `test`; insert into t0 select GET_LOCK("lock1",null) master-bin.000001 1541 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
master-bin.000001 1251 Query 1 1251 use `test`; create table t2 (n int) engine=innodb master-bin.000001 1648 Query 1 # use `test`; create table t2 (n int) engine=innodb
master-bin.000001 1323 Query 1 1323 use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti` master-bin.000001 1748 Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
master-bin.000001 1424 Query 1 1424 use `test`; DO RELEASE_LOCK("lock1")
do release_lock("lock1"); do release_lock("lock1");
drop table t0,t2; drop table t0,t2;

4
mysql-test/t/mix_innodb_myisam_binlog.test
View File

@ -253,7 +253,9 @@ insert into t2 values (3);
disconnect con2; disconnect con2;
connection con3; connection con3;
select get_lock("lock1",60); select get_lock("lock1",60);
show binlog events from 79; --replace_column 5 #
--replace_result "xid=208" "xid=105" "xid=227" "xid=114" "xid=230" "xid=115" "xid=234" "xid=117" "xid=261" "xid=132"
show binlog events from 98;
do release_lock("lock1"); do release_lock("lock1");
drop table t0,t2; drop table t0,t2;