mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-5.1-new

Browse source 
into  devsrv-b.mysql.com:/space/magnus/my51-bug17386
This commit is contained in:
unknown 2006-02-15 17:21:26 +01:00
commit 4c024cd09e
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mysql-test/r/binlog_row_mix_innodb_myisam.result
View file

@ -210,7 +210,7 @@ master-bin.000001 282 Write_rows 1 #
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
alter table t2 engine=MyISAM;
insert into t1 values (1);
begin;
select * from t1 for update;
@ -266,18 +266,18 @@ master-bin.000001 343 Query 1 # use `test`; delete from t1
master-bin.000001 420 Xid 1 # COMMIT /* xid= */
master-bin.000001 447 Query 1 # use `test`; delete from t2
master-bin.000001 524 Xid 1 # COMMIT /* xid= */
master-bin.000001 551 Query 1 # use `test`; alter table t2 type=MyISAM
master-bin.000001 640 Table_map 1 # test.t1
master-bin.000001 679 Write_rows 1 #
master-bin.000001 713 Xid 1 # COMMIT /* xid= */
master-bin.000001 740 Table_map 1 # test.t2
master-bin.000001 779 Write_rows 1 #
master-bin.000001 813 Query 1 # use `test`; drop table t1,t2
master-bin.000001 892 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 978 Table_map 1 # test.t0
master-bin.000001 1017 Write_rows 1 #
master-bin.000001 1051 Table_map 1 # test.t0
master-bin.000001 1090 Write_rows 1 #
master-bin.000001 1124 Query 1 # use `test`; create table t2 (n int) engine=innodb
master-bin.000001 551 Query 1 # use `test`; alter table t2 engine=MyISAM
master-bin.000001 642 Table_map 1 # test.t1
master-bin.000001 681 Write_rows 1 #
master-bin.000001 715 Xid 1 # COMMIT /* xid= */
master-bin.000001 742 Table_map 1 # test.t2
master-bin.000001 781 Write_rows 1 #
master-bin.000001 815 Query 1 # use `test`; drop table t1,t2
master-bin.000001 894 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 980 Table_map 1 # test.t0
master-bin.000001 1019 Write_rows 1 #
master-bin.000001 1053 Table_map 1 # test.t0
master-bin.000001 1092 Write_rows 1 #
master-bin.000001 1126 Query 1 # use `test`; create table t2 (n int) engine=innodb
do release_lock("lock1");
drop table t0,t2;

1
mysql-test/t/disabled.def
View file

@ -33,7 +33,6 @@ rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
subselect : Bug#15706 (ps mode) [PATCH PENDING]
rpl_ndb_log : result not deterministic
binlog_row_mix_innodb_myisam : Bug #17386
binlog_row_insert_select : Bug #17385
rpl_row_basic_2myisam : Bug #17385
rpl_row_basic_3innodb : Bug #17385