database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new
This commit is contained in:
mats@mysql.com
2006-01-09 09:47:23 +01:00
parent 1c599c8eeb fb0145c55c
commit 373abaf476
3 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/r/binlog_row_mix_innodb_myisam.result
View File

@ -262,21 +262,22 @@ master-bin.000001 209 Write_rows 1 #
master-bin.000001 243 Table_map 1 # test.t1
master-bin.000001 282 Write_rows 1 #
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
master-bin.000001 343 Table_map 1 # test.t1
master-bin.000001 382 Delete_rows 1 #
master-bin.000001 421 Xid 1 # COMMIT /* xid= */
master-bin.000001 448 Query 1 # use `test`; alter table t2 type=MyISAM
master-bin.000001 537 Table_map 1 # test.t1
master-bin.000001 576 Write_rows 1 #
master-bin.000001 610 Xid 1 # COMMIT /* xid= */
master-bin.000001 637 Table_map 1 # test.t2
master-bin.000001 676 Write_rows 1 #
master-bin.000001 710 Query 1 # use `test`; drop table t1,t2
master-bin.000001 789 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 875 Table_map 1 # test.t0
master-bin.000001 914 Write_rows 1 #
master-bin.000001 948 Table_map 1 # test.t0
master-bin.000001 987 Write_rows 1 #
master-bin.000001 1021 Query 1 # use `test`; create table t2 (n int) engine=innodb
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
do release_lock("lock1");
drop table t0,t2;

2
mysql-test/t/disabled.def
View File

@ -21,6 +21,6 @@ innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)
subselect : Bug#15706
type_time : Bug#15805
#rpl000002 : Bug#15920 Temporary tables are not binlogged in SBR
ps_7ndb : Bug#15923 Core dump in RBR mode when executing test suite
#ps_7ndb : Bug#15923 Core dump in RBR mode when executing test suite
rpl_ddl : Bug#15963 SBR does not show "Definer" correctly
mysqlslap : Bug#16167