database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-19 21:09:40 +03:00
Code Activity

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

Browse Source 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl


mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
This commit is contained in:
unknown
2007-06-11 22:18:10 +02:00
parent 1f89a70d0a abbf5941d9
commit 24eb04abea
83 changed files with 2089 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/t/rpl_rotate_logs.test
View File

@@ -63,9 +63,7 @@ insert into temp_table values ("testing temporary tables");
create table t1 (s text);
insert into t1 values('Could not break slave'),('Tried hard');
sync_slave_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
show slave status;
source include/show_slave_status.inc;
select * from t1;
connection master;
flush logs;
@@ -125,9 +123,7 @@ purge master logs before (@time_for_purge);
show binary logs;
insert into t2 values (65);
sync_slave_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
show slave status;
source include/show_slave_status.inc;
select * from t2;
#
@@ -157,9 +153,7 @@ connection slave;
sync_with_master;
select * from t4;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
show slave status;
source include/show_slave_status.inc;
# because of concurrent insert, the table may not be up to date
# if we do not lock
lock tables t3 read;