Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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.1852 05/05/12 17:17:48 mats@stripped +13 -0
WL#2325: test changes
mysql-test/t/rpl_until.test
1.21 05/05/12 17:17:43 mats@stripped +1 -0
Removing binlog positions
mysql-test/t/rpl_row_trans.test
1.6 05/05/12 17:17:43 mats@stripped +1 -1
Removing binlog positions
mysql-test/t/rpl_row_charset.test
1.3 05/05/12 17:17:43 mats@stripped +4 -0
Removed warnings
mysql-test/t/rpl_mystery22.test
1.7 05/05/12 17:17:43 mats@stripped +4 -0
Removed warnings
mysql-test/t/rpl_log.test
1.30 05/05/12 17:17:43 mats@stripped +8 -0
Removing binlog positions
mysql-test/t/rpl_loaddata_rule_s.test
1.10 05/05/12 17:17:43 mats@stripped +1 -0
Removing binlog positions
mysql-test/t/rpl_heap.test
1.6 05/05/12 17:17:43 mats@stripped +2 -0
Removing binlog positions
mysql-test/t/rpl_flush_log_loop.test
1.12 05/05/12 17:17:43 mats@stripped +5 -0
Removed warnings
mysql-test/t/rpl000001_row.test
1.3 05/05/12 17:17:43 mats@stripped +1 -1
Minor change
mysql-test/t/disabled.def
1.18 05/05/12 17:17:43 mats@stripped +7 -2
Disabling tests
mysql-test/r/rpl_row_charset.result
1.2 05/05/12 17:17:43 mats@stripped +0 -4
Removed warnings
mysql-test/r/rpl_flush_log_loop.result
1.32 05/05/12 17:17:43 mats@stripped +1 -0
Stopping slave before change master
mysql-test/r/rpl000001_row.result
1.2 05/05/12 17:17:43 mats@stripped +0 -4
Removed warnings
# 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: mats
# Host: romeo.kindahl.net
# Root: /home/bk/w2325-mysql-5.1
--- 1.20/mysql-test/t/rpl_until.test 2005-05-12 12:05:56 +02:00
+++ 1.21/mysql-test/t/rpl_until.test 2005-05-12 17:17:43 +02:00
@@ -23,6 +23,7 @@
insert into t2 values (3),(4);
drop table t2;
--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events;
# try to replicate all queries until drop of t1
--- 1.5/mysql-test/t/rpl_heap.test 2005-04-29 02:45:17 +02:00
+++ 1.6/mysql-test/t/rpl_heap.test 2005-05-12 17:17:43 +02:00
@@ -21,6 +21,7 @@
create table t1 type=HEAP select 10 as a;
insert into t1 values(11);
save_master_pos;
+--replace_column 2 # 5 #
show binlog events from 79;
connection slave;
reset slave;
@@ -38,6 +39,7 @@
# (the LIMIT is to not use the query cache)
select * from t1 limit 10;
save_master_pos;
+--replace_column 2 # 5 #
show binlog events in 'master-bin.002' from 79;
connection slave;
--- 1.9/mysql-test/t/rpl_loaddata_rule_s.test 2005-04-29 02:45:17 +02:00
+++ 1.10/mysql-test/t/rpl_loaddata_rule_s.test 2005-05-12 17:17:43 +02:00
@@ -20,4 +20,5 @@
connection slave;
sync_with_master;
select count(*) from t1; # check that LOAD was replicated
+--replace_column 2 # 5 #
show binlog events from 102; # should be nothing
--- 1.17/mysql-test/t/disabled.def 2005-05-12 14:34:51 +02:00
+++ 1.18/mysql-test/t/disabled.def 2005-05-12 17:17:43 +02:00
@@ -16,7 +16,12 @@
ndb_cache_multi : replication conflict
ndb_cache_multi2 : replication conflict
ndb_insert : REPLACE replication conflict
-rpl_row_trans : NYI - non-transactional tables in transactions
rpl_do_grant : NYI - grants table requires special treatment on slave
-select : result mismatch
rpl_insert_id : NYI - handling of foreign keys on slave side
+rpl_mystery22 : result mismatch
+rpl_row_trans : NYI - non-transactional tables in transactions
+rpl_sp : failing test due to different binlog positions
+rpl_trunc_binlog : binlog difference in result files
+rpl_user_variables : binlog difference in result files
+select : result mismatch
+rpl_relayrotate : result mismatch
--- 1.1/mysql-test/r/rpl000001_row.result 2005-05-11 08:58:47 +02:00
+++ 1.2/mysql-test/r/rpl000001_row.result 2005-05-12 17:17:43 +02:00
@@ -5,10 +5,6 @@
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
drop table if exists t1,t2,t3;
-Warnings:
-Note 1051 Unknown table 't1'
-Note 1051 Unknown table 't2'
-Note 1051 Unknown table 't3'
create table t1 (word char(20) not null);
load data infile '../../std_data/words.dat' into table t1;
load data local infile 'MYSQL_TEST_DIR/std_data/words.dat' into table t1;
--- 1.1/mysql-test/r/rpl_row_charset.result 2005-05-11 08:58:48 +02:00
+++ 1.2/mysql-test/r/rpl_row_charset.result 2005-05-12 17:17:43 +02:00
@@ -6,11 +6,7 @@
start slave;
set timestamp=1000000000;
drop database if exists mysqltest2;
-Warnings:
-Note 1008 Can't drop database 'mysqltest2'; database doesn't exist
drop database if exists mysqltest3;
-Warnings:
-Note 1008 Can't drop database 'mysqltest3'; database doesn't exist
create database mysqltest2 character set latin2;
set @@character_set_server=latin5;
create database mysqltest3;
--- 1.2/mysql-test/t/rpl000001_row.test 2005-05-12 16:36:53 +02:00
+++ 1.3/mysql-test/t/rpl000001_row.test 2005-05-12 17:17:43 +02:00
@@ -1,5 +1,5 @@
--- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
+-- source include/have_binlog_format_row.inc
--disable_warnings
drop table if exists t1,t2,t3;
--- 1.2/mysql-test/t/rpl_row_charset.test 2005-05-12 16:36:53 +02:00
+++ 1.3/mysql-test/t/rpl_row_charset.test 2005-05-12 17:17:43 +02:00
@@ -27,7 +27,9 @@
connection master;
set @@collation_server=armscii8_bin;
+--disable_warnings
drop database mysqltest3;
+--enable_warnings
create database mysqltest3;
--disable_query_log
select "--- --master--" as "";
@@ -106,8 +108,10 @@
select * from mysqltest2.t1 order by a;
connection master;
+--disable_warnings
drop database mysqltest2;
drop database mysqltest3;
+--enable_warnings
sync_slave_with_master;
# Check that we can change global.collation_server (since 5.0.3)
--- 1.5/mysql-test/t/rpl_row_trans.test 2005-05-12 16:36:53 +02:00
+++ 1.6/mysql-test/t/rpl_row_trans.test 2005-05-12 17:17:43 +02:00
@@ -21,7 +21,7 @@
SELECT * FROM t4;
SELECT * FROM t5;
--replace_result $VERSION VERSION
---replace_column 1 <binlog> 4 <server-id> 5 <End-pos>
+--replace_column 1 <binlog> 2 # 4 <server-id> 5 #
SHOW BINLOG EVENTS FROM 1354;
sync_slave_with_master;
SELECT * FROM t4;
--- 1.31/mysql-test/r/rpl_flush_log_loop.result 2005-05-12 14:53:59 +02:00
+++ 1.32/mysql-test/r/rpl_flush_log_loop.result 2005-05-12 17:17:43 +02:00
@@ -4,6 +4,7 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+stop slave;
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;
start slave;
--- 1.11/mysql-test/t/rpl_flush_log_loop.test 2005-05-12 16:36:53 +02:00
+++ 1.12/mysql-test/t/rpl_flush_log_loop.test 2005-05-12 17:17:43 +02:00
@@ -4,12 +4,17 @@
-- source include/master-slave.inc
connection slave;
+--disable_warnings
+stop slave;
+--enable_warnings
--replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT;
start slave;
connection master;
+--disable_warnings
stop slave;
+--enable_warnings
--replace_result $SLAVE_MYPORT SLAVE_PORT
eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$SLAVE_MYPORT;
--- 1.29/mysql-test/t/rpl_log.test 2005-05-12 12:05:55 +02:00
+++ 1.30/mysql-test/t/rpl_log.test 2005-05-12 17:17:43 +02:00
@@ -40,9 +40,13 @@
select count(*) from t1;
drop table t1;
--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events;
+--replace_column 2 # 5 #
show binlog events from 102 limit 1;
+--replace_column 2 # 5 #
show binlog events from 102 limit 2;
+--replace_column 2 # 5 #
show binlog events from 102 limit 2,1;
flush logs;
@@ -84,8 +88,10 @@
insert into t1 values (1);
drop table t1;
--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events;
--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events in 'master-bin.000002';
show binary logs;
save_master_pos;
@@ -94,8 +100,10 @@
sync_with_master;
show binary logs;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events in 'slave-bin.000001' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_column 2 # 5 #
show binlog events in 'slave-bin.000002' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
--- 1.6/mysql-test/t/rpl_mystery22.test 2002-10-25 01:46:13 +02:00
+++ 1.7/mysql-test/t/rpl_mystery22.test 2005-05-12 17:17:43 +02:00
@@ -14,7 +14,9 @@
sleep 3; # there is no way around this sleep - we have to wait until
# the slave tries to run the query, fails and aborts slave thread
delete from t1 where n = 2;
+--disable_warnings
start slave;
+--enable_warnings
sync_with_master;
#now the buggy slave would be confused on the offset but it can replicate
#in order to make it break, we need to stop/start the slave one more time
@@ -27,7 +29,9 @@
insert into t1 values(NULL);
save_master_pos;
connection slave;
+--disable_warnings
start slave;
+--enable_warnings
#now the truth comes out - if the slave is buggy, it will never sync because
#the slave thread is not able to read events
sync_with_master;
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.1852) | Mats Kindahl | 12 May |
