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

After merge fixes.

Browse Source 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
This commit is contained in:
monty@mashka.mysql.fi
2003-09-11 19:06:23 +03:00
parent 80565e1352
commit 45aa92c574
32 changed files with 259 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@ insert into tm select * from ti;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(1)
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
master-bin.001 244 Query 1 244 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(1)
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 244 Query 1 244 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@ -22,10 +22,10 @@ rollback;
Warning: Some non-transactional changed tables couldn't be rolled back
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(2)
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
master-bin.001 244 Query 1 244 use test; ROLLBACK
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(2)
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 244 Query 1 244 use ; ROLLBACK
delete from ti;
delete from tm;
reset master;
@ -39,13 +39,13 @@ Warning: Some non-transactional changed tables couldn't be rolled back
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(3)
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
master-bin.001 235 Query 1 79 use test; insert into ti values(4)
master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
master-bin.001 429 Query 1 429 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(3)
master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
master-bin.000001 235 Query 1 79 use ; insert into ti values(4)
master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
master-bin.000001 429 Query 1 429 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@ -64,14 +64,14 @@ a
7
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(5)
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
master-bin.001 235 Query 1 79 use test; insert into ti values(6)
master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
master-bin.001 429 Query 1 79 use test; insert into ti values(7)
master-bin.001 488 Query 1 488 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(5)
master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
master-bin.000001 235 Query 1 79 use ; insert into ti values(6)
master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
master-bin.000001 429 Query 1 79 use ; insert into ti values(7)
master-bin.000001 488 Query 1 488 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@ -86,10 +86,10 @@ get_lock("a",10)
1
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(8)
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
master-bin.001 244 Query 1 244 use test; ROLLBACK
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(8)
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 244 Query 1 244 use ; ROLLBACK
delete from ti;
delete from tm;
reset master;
@ -97,8 +97,8 @@ insert into ti values(9);
insert into tm select * from ti;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; insert into ti values(9)
master-bin.001 138 Query 1 138 use test; insert into tm select * from ti
master-bin.000001 79 Query 1 79 use ; insert into ti values(9)
master-bin.000001 138 Query 1 138 use ; insert into tm select * from ti
delete from ti;
delete from tm;
reset master;
@ -107,17 +107,17 @@ begin;
insert into tm select * from ti;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; insert into ti values(10)
master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
insert into ti values(11);
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; insert into ti values(10)
master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
master-bin.001 205 Query 1 205 use test; BEGIN
master-bin.001 245 Query 1 205 use test; insert into ti values(11)
master-bin.001 305 Query 1 305 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
master-bin.000001 205 Query 1 205 use ; BEGIN
master-bin.000001 245 Query 1 205 use ; insert into ti values(11)
master-bin.000001 305 Query 1 305 use ; COMMIT
alter table tm type=INNODB;
delete from ti;
delete from tm;
@ -128,10 +128,10 @@ insert into tm select * from ti;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(12)
master-bin.001 179 Query 1 79 use test; insert into tm select * from ti
master-bin.001 245 Query 1 245 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(12)
master-bin.000001 179 Query 1 79 use ; insert into tm select * from ti
master-bin.000001 245 Query 1 245 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@ -153,9 +153,9 @@ rollback to savepoint my_savepoint;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(14)
master-bin.001 179 Query 1 179 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(14)
master-bin.000001 179 Query 1 179 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@ -173,8 +173,8 @@ a
18
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use test; BEGIN
master-bin.001 119 Query 1 79 use test; insert into ti values(16)
master-bin.001 179 Query 1 79 use test; insert into ti values(18)
master-bin.001 239 Query 1 239 use test; COMMIT
master-bin.000001 79 Query 1 79 use ; BEGIN
master-bin.000001 119 Query 1 79 use ; insert into ti values(16)
master-bin.000001 179 Query 1 79 use ; insert into ti values(18)
master-bin.000001 239 Query 1 239 use ; COMMIT
drop table ti,tm;