mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/r/rpl_drop_db.result:
  Manual merge
mysql-test/r/rpl_variables.result:
  Manual merge
mysql-test/t/rpl_drop_db.test:
  Manual merge
mysql-test/t/rpl_sp.test:
  Manual merge
mysql-test/t/rpl_timezone.test:
  Manual merge
mysql-test/t/rpl_variables.test:
  Manual merge
This commit is contained in:
unknown 2006-11-15 10:31:23 +01:00
commit 4e0cace23d
30 changed files with 96 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_deadlock.test
View file

@ -91,7 +91,7 @@ show slave status;
# Now we repeat 2), but with BEGIN in the same relay log as
# COMMIT (to see if seeking into hot log is ok).
set @my_max_relay_log_size= @@global.max_relay_log_size;
set global max_relay_log_size=0;
# This is really copy-paste of 2) of above
@ -114,5 +114,6 @@ show slave status;
connection master;
drop table t1,t2,t3,t4;
sync_slave_with_master;
set global max_relay_log_size= @my_max_relay_log_size;
# End of 4.1 tests

5
mysql-test/extra/rpl_tests/rpl_max_relay_size.test
View file

@ -34,6 +34,7 @@ reset slave;
--echo # Test 1
--echo #
set @my_max_binlog_size= @@global.max_binlog_size;
set global max_binlog_size=8192;
set global max_relay_log_size=8192-1; # mapped to 4096
select @@global.max_relay_log_size;
@ -130,6 +131,10 @@ flush logs;
-- replace_column 3 <Binlog_Ignore_DB>
show master status;
# Restore max_binlog_size
connection slave;
set global max_binlog_size= @my_max_binlog_size;
--echo #
--echo # End of 4.1 tests
--echo #