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

Merging with mysql-5.1-new-rpl

Browse Source
This commit is contained in:
mats@romeo.(none)
2007-02-21 13:52:42 +01:00
parent 39de08fddc e61a1841a5
commit 3306196a7a
38 changed files with 541 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/rpl_deadlock_innodb.result
View File

@ -80,7 +80,7 @@ Master_SSL_Key
Seconds_Behind_Master #
stop slave;
delete from t3;
change master to master_log_pos=544;
change master to master_log_pos=547;
begin;
select * from t2 for update;
a
@ -136,7 +136,7 @@ set @my_max_relay_log_size= @@global.max_relay_log_size;
set global max_relay_log_size=0;
stop slave;
delete from t3;
change master to master_log_pos=544;
change master to master_log_pos=547;
begin;
select * from t2 for update;
a