Below is the list of changes that have just been committed into a local
5.1 repository of matthias. When matthias does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2340 06/04/18 11:33:17 mleich@stripped +4 -0
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
into three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-1
mysql-test/r/rpl_deadlock_innodb.result
1.10 06/04/18 11:30:42 matthias@stripped +0 -3
updated result
mysql-test/extra/rpl_tests/rpl_deadlock.test
1.13 06/04/18 11:30:41 matthias@stripped +1 -2
merge 5.0 change into 5.1
mysql-test/t/rpl_stm_until.test
1.23 06/04/18 11:04:41 matthias@stripped +0 -0
Auto merged
mysql-test/t/rpl_relayrotate.test
1.19 06/04/18 11:04:41 matthias@stripped +0 -3
Auto merged
mysql-test/t/rpl_stm_until.test
1.21.1.2 06/04/18 11:04:40 matthias@stripped +0 -0
Merge rename: mysql-test/t/rpl_until.test -> mysql-test/t/rpl_stm_until.test
mysql-test/r/rpl_deadlock_innodb.result
1.8.1.2 06/04/18 11:04:40 matthias@stripped +0 -0
Merge rename: mysql-test/r/rpl_deadlock.result -> mysql-test/r/rpl_deadlock_innodb.result
mysql-test/extra/rpl_tests/rpl_deadlock.test
1.11.1.2 06/04/18 11:04:40 matthias@stripped +0 -0
Merge rename: mysql-test/t/rpl_deadlock.test -> mysql-test/extra/rpl_tests/rpl_deadlock.test
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mleich
# Host: three.local.lan
# Root: /home/matthias/Arbeit/mysql-5.1/src-1/RESYNC
--- 1.21.1.1/mysql-test/t/rpl_until.test 2006-04-13 20:47:00 +02:00
+++ 1.23/mysql-test/t/rpl_stm_until.test 2006-04-18 11:04:41 +02:00
@@ -1,4 +1,7 @@
-source include/master-slave.inc;
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
+
+# Test is dependent on binlog positions
# prepare version for substitutions
let $VERSION=`select version()`;
@@ -19,12 +22,10 @@
insert into t2 values (1),(2);
insert into t2 values (3),(4);
drop table t2;
---replace_result $VERSION VERSION
-show binlog events;
# try to replicate all queries until drop of t1
connection slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=319;
+start slave until master_log_file='master-bin.000001', master_log_pos=323;
sleep 2;
wait_for_slave_to_stop;
# here table should be still not deleted
@@ -43,7 +44,7 @@
--replace_column 1 # 9 # 11 # 23 # 33 #
show slave status;
-# try replicate all until second insert to t2;
+# try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
sleep 2;
wait_for_slave_to_stop;
--- 1.8.1.1/mysql-test/r/rpl_deadlock.result 2006-04-13 21:08:38 +02:00
+++ 1.10/mysql-test/r/rpl_deadlock_innodb.result 2006-04-18 11:30:42 +02:00
@@ -4,10 +4,10 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-create table t1 (a int not null, key(a)) engine=innodb;
-create table t2 (a int not null, key(a)) engine=innodb;
-create table t3 (a int) engine=innodb;
-create table t4 (a int) engine=innodb;
+CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=innodb;
+CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=innodb;
+CREATE TABLE t3 (a INT) ENGINE=innodb;
+CREATE TABLE t4 (a INT) ENGINE=innodb;
show variables like 'slave_transaction_retries';
Variable_name Value
slave_transaction_retries 10
@@ -78,7 +78,7 @@
Master_SSL_Key
Seconds_Behind_Master #
stop slave;
-change master to master_log_pos=532;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
a
@@ -128,7 +128,7 @@
Seconds_Behind_Master #
set global max_relay_log_size=0;
stop slave;
-change master to master_log_pos=532;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
a
--- 1.11.1.1/mysql-test/t/rpl_deadlock.test 2006-04-13 20:47:00 +02:00
+++ 1.13/mysql-test/extra/rpl_tests/rpl_deadlock.test 2006-04-18 11:30:41 +02:00
@@ -10,14 +10,13 @@
# We don't 'show status like 'slave_retried_transactions'' because this
# is not repeatable (depends on sleeps).
-source include/have_innodb.inc;
-source include/master-slave.inc;
+-- source include/master-slave.inc
connection master;
-create table t1 (a int not null, key(a)) engine=innodb;
-create table t2 (a int not null, key(a)) engine=innodb;
-create table t3 (a int) engine=innodb;
-create table t4 (a int) engine=innodb;
+eval CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type;
+eval CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type;
+eval CREATE TABLE t3 (a INT) ENGINE=$engine_type;
+eval CREATE TABLE t4 (a INT) ENGINE=$engine_type;
show variables like 'slave_transaction_retries';
sync_slave_with_master;
@@ -65,7 +64,7 @@
select * from t1; # check that slave succeeded finally
select * from t2;
# check that no error is reported
---replace_column 1 # 8 # 9 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
@@ -74,7 +73,7 @@
# 2) Test lock wait timeout
stop slave;
-change master to master_log_pos=532; # the BEGIN log event
+change master to master_log_pos=536; # the BEGIN log event
begin;
select * from t2 for update; # hold lock
start slave;
@@ -84,7 +83,7 @@
select * from t1; # check that slave succeeded finally
select * from t2;
# check that no error is reported
---replace_column 1 # 8 # 9 # 11 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
@@ -97,7 +96,7 @@
# This is really copy-paste of 2) of above
stop slave;
-change master to master_log_pos=532;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
start slave;
@@ -106,7 +105,7 @@
sync_with_master;
select * from t1;
select * from t2;
---replace_column 1 # 8 # 9 # 11 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
| Thread |
|---|
| • bk commit into 5.1 tree (mleich:1.2340) | mleich | 18 Apr |
