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

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@pilot.blaudden
2007-04-02 11:15:09 +02:00
parent 8b8a61d77a cbe7c63fc7
commit fc904eaead
201 changed files with 3947 additions and 2312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
stop slave;
delete from t3;
change master to master_log_pos=548;
@ -132,6 +133,7 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
set @my_max_relay_log_size= @@global.max_relay_log_size;
set global max_relay_log_size=0;
stop slave;
@ -191,6 +193,7 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
drop table t1,t2,t3,t4;
set global max_relay_log_size= @my_max_relay_log_size;
End of 5.1 tests