mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
c23c38fa31
Binlog lacks encoding info about DROPped temporary table. Idea of the fix is to switch temporary to system_charset_info when a temporary table is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query the binlog should be updated on the server's encoding for the coming DROP. The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code. mysql-test/r/drop_temp_table.result: results changed mysql-test/r/mix_innodb_myisam_binlog.result: results changed mysql-test/r/mysqlbinlog.result: results changed mysql-test/r/rpl_temporary.result: results changed mysql-test/t/mysqlbinlog.test: Check roll-forward recovery from binlog where there are DROP temporary tables created in koi8r. mysql-test/t/rpl_temporary.test: Check slave digests binlog with DROP temporary tables created in koi8r. sql/mysql_priv.h: `write_binlog_with_system_charset()' is added to be called when a binlog event is created "implicitly" like DROP temporary table is case of closing connection. sql/sql_base.cc: Idea of the fix is to switch temporary to system_charset_info when a temporary table is DROPped for binlog. Since that is the server, not the client, who generates the query the binlog should be updated on server's encoding for the coming DROP.
282 lines
9.6 KiB
Text
282 lines
9.6 KiB
Text
drop table if exists t1, t2;
|
|
create table t1 (a int) engine=innodb;
|
|
create table t2 (a int) engine=myisam;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(1);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(1)
|
|
master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 347 Xid 1 # COMMIT /* xid=8 */
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(2);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(2)
|
|
master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 347 Query 1 # use `test`; ROLLBACK
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(3);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(4);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
commit;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(3)
|
|
master-bin.000001 253 Query 1 # use `test`; savepoint my_savepoint
|
|
master-bin.000001 338 Query 1 # use `test`; insert into t1 values(4)
|
|
master-bin.000001 425 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 519 Query 1 # use `test`; rollback to savepoint my_savepoint
|
|
master-bin.000001 616 Xid 1 # COMMIT /* xid=25 */
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(5);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(6);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
insert into t1 values(7);
|
|
commit;
|
|
select a from t1 order by a;
|
|
a
|
|
5
|
|
7
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(5)
|
|
master-bin.000001 253 Query 1 # use `test`; savepoint my_savepoint
|
|
master-bin.000001 338 Query 1 # use `test`; insert into t1 values(6)
|
|
master-bin.000001 425 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 519 Query 1 # use `test`; rollback to savepoint my_savepoint
|
|
master-bin.000001 616 Query 1 # use `test`; insert into t1 values(7)
|
|
master-bin.000001 703 Xid 1 # COMMIT /* xid=37 */
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(8)
|
|
master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 347 Query 1 # use `test`; ROLLBACK
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
insert into t1 values(9);
|
|
insert into t2 select * from t1;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(9)
|
|
master-bin.000001 185 Xid 1 # COMMIT /* xid=60 */
|
|
master-bin.000001 212 Query 1 # use `test`; insert into t2 select * from t1
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
insert into t1 values(10);
|
|
begin;
|
|
insert into t2 select * from t1;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
|
|
master-bin.000001 186 Xid 1 # COMMIT /* xid=66 */
|
|
master-bin.000001 213 Query 1 # use `test`; insert into t2 select * from t1
|
|
insert into t1 values(11);
|
|
commit;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
|
|
master-bin.000001 186 Xid 1 # COMMIT /* xid=66 */
|
|
master-bin.000001 213 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 307 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 375 Query 1 # use `test`; insert into t1 values(11)
|
|
master-bin.000001 463 Xid 1 # COMMIT /* xid=68 */
|
|
alter table t2 engine=INNODB;
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(12);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(12)
|
|
master-bin.000001 254 Query 1 # use `test`; insert into t2 select * from t1
|
|
master-bin.000001 348 Xid 1 # COMMIT /* xid=78 */
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(13);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(14);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(15);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(14)
|
|
master-bin.000001 254 Xid 1 # COMMIT /* xid=94 */
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
begin;
|
|
insert into t1 values(16);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(17);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(18);
|
|
commit;
|
|
select a from t1 order by a;
|
|
a
|
|
16
|
|
18
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(16)
|
|
master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
|
|
master-bin.000001 342 Xid 1 # COMMIT /* xid=105 */
|
|
delete from t1;
|
|
delete from t2;
|
|
alter table t2 type=MyISAM;
|
|
insert into t1 values (1);
|
|
begin;
|
|
select * from t1 for update;
|
|
a
|
|
1
|
|
select (@before:=unix_timestamp())*0;
|
|
(@before:=unix_timestamp())*0
|
|
0
|
|
begin;
|
|
select * from t1 for update;
|
|
insert into t2 values (20);
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
select (@after:=unix_timestamp())*0;
|
|
(@after:=unix_timestamp())*0
|
|
0
|
|
select (@after-@before) >= 2;
|
|
(@after-@before) >= 2
|
|
1
|
|
drop table t1,t2;
|
|
commit;
|
|
begin;
|
|
create temporary table ti (a int) engine=innodb;
|
|
rollback;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
insert into ti values(1);
|
|
set autocommit=0;
|
|
create temporary table t1 (a int) engine=myisam;
|
|
commit;
|
|
insert t1 values (1);
|
|
rollback;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
create table t0 (n int);
|
|
insert t0 select * from t1;
|
|
set autocommit=1;
|
|
insert into t0 select GET_LOCK("lock1",null);
|
|
set autocommit=0;
|
|
create table t2 (n int) engine=innodb;
|
|
insert into t2 values (3);
|
|
select get_lock("lock1",60);
|
|
get_lock("lock1",60)
|
|
1
|
|
show binlog events from 98;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 98 Query 1 # use `test`; BEGIN
|
|
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(16)
|
|
master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
|
|
master-bin.000001 342 Xid 1 # COMMIT /* xid=105 */
|
|
master-bin.000001 369 Query 1 # use `test`; delete from t1
|
|
master-bin.000001 446 Xid 1 # COMMIT /* xid=114 */
|
|
master-bin.000001 473 Query 1 # use `test`; delete from t2
|
|
master-bin.000001 550 Xid 1 # COMMIT /* xid=115 */
|
|
master-bin.000001 577 Query 1 # use `test`; alter table t2 type=MyISAM
|
|
master-bin.000001 666 Query 1 # use `test`; insert into t1 values (1)
|
|
master-bin.000001 754 Xid 1 # COMMIT /* xid=117 */
|
|
master-bin.000001 781 Query 1 # use `test`; insert into t2 values (20)
|
|
master-bin.000001 870 Query 1 # use `test`; drop table t1,t2
|
|
master-bin.000001 949 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
|
|
master-bin.000001 1059 Query 1 # use `test`; insert into ti values(1)
|
|
master-bin.000001 1146 Xid 1 # COMMIT /* xid=132 */
|
|
master-bin.000001 1173 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
|
|
master-bin.000001 1283 Query 1 # use `test`; insert t1 values (1)
|
|
master-bin.000001 1366 Query 1 # use `test`; create table t0 (n int)
|
|
master-bin.000001 1452 Query 1 # use `test`; insert t0 select * from t1
|
|
master-bin.000001 1541 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
|
|
master-bin.000001 1648 Query 1 # use `test`; create table t2 (n int) engine=innodb
|
|
master-bin.000001 1748 Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
|
|
do release_lock("lock1");
|
|
drop table t0,t2;
|
|
reset master;
|
|
create table t1 (a int) engine=innodb;
|
|
create table t2 (a int) engine=myisam;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
select get_lock("a",10);
|
|
get_lock("a",10)
|
|
1
|
|
select
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
|
|
is not null;
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
|
|
is not null
|
|
1
|
|
select
|
|
@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
|
|
@a not like "%#%error_code=%error_code=%";
|
|
@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%" @a not like "%#%error_code=%error_code=%"
|
|
1 1
|
|
drop table t1, t2;
|