Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet@stripped, 2001-12-01 15:00:32-07:00, sasha@stripped
use $MASTER_PORT
mysql-test/t/rpl000015.test
1.18 01/12/01 15:00:31 sasha@stripped +0 -3
use $MASTER_PORT
mysql-test/r/rpl000014.result
1.12 01/12/01 15:00:30 sasha@stripped +4 -4
use $MASTER_PORT
mysql-test/r/rpl000015.result
1.13 01/12/01 15:00:30 sasha@stripped +4 -4
use $MASTER_PORT
mysql-test/t/rpl000014.test
1.14 01/12/01 15:00:30 sasha@stripped +1 -4
use $MASTER_PORT
# 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: sasha
# Host: mysql.sashanet.com
# Root: /reiser-data/mysql-4.0
--- 1.11/mysql-test/r/rpl000014.result Wed Oct 10 18:59:44 2001
+++ 1.12/mysql-test/r/rpl000014.result Sat Dec 1 15:00:30 2001
@@ -8,21 +8,21 @@
master-bin.001 79
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 1 master-bin.001 79 Yes 0 0 1
+127.0.0.1 root $MASTER_MYPORT 1 master-bin.001 79 Yes 0 0 1
change master to master_log_pos=73;
slave stop;
change master to master_log_pos=73;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 1 master-bin.001 73 No 0 0 1
+127.0.0.1 root $MASTER_MYPORT 1 master-bin.001 73 No 0 0 1
slave start;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0 1
+127.0.0.1 root $MASTER_MYPORT 1 master-bin.001 73 Yes 0 0 1
change master to master_log_pos=173;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0 1
+127.0.0.1 root $MASTER_MYPORT 1 master-bin.001 173 Yes 0 0 1
show master status;
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 79
--- 1.12/mysql-test/r/rpl000015.result Sun Nov 4 06:43:40 2001
+++ 1.13/mysql-test/r/rpl000015.result Sat Dec 1 15:00:30 2001
@@ -9,16 +9,16 @@
change master to master_host='127.0.0.1';
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 test 9998 60 4 No 0 0 0
+127.0.0.1 test 3306 60 4 No 0 0 0
change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=$MASTER_MYPORT;
+master_password='',master_port=9306;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 60 4 No 0 0 0
+127.0.0.1 root 9306 60 4 No 0 0 0
slave start;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 60 master-bin.001 79 Yes 0 0 1
+127.0.0.1 root 9306 60 master-bin.001 79 Yes 0 0 1
drop table if exists t1;
create table t1 (n int);
insert into t1 values (10),(45),(90);
--- 1.13/mysql-test/t/rpl000014.test Wed Oct 10 18:59:42 2001
+++ 1.14/mysql-test/t/rpl000014.test Sat Dec 1 15:00:30 2001
@@ -1,21 +1,18 @@
+eval_result;
source include/master-slave.inc;
connection master;
show master status;
save_master_pos;
connection slave;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
change master to master_log_pos=73;
slave stop;
change master to master_log_pos=73;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
slave start;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
change master to master_log_pos=173;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
connection master;
show master status;
--- 1.17/mysql-test/t/rpl000015.test Wed Oct 10 18:59:42 2001
+++ 1.18/mysql-test/t/rpl000015.test Sat Dec 1 15:00:31 2001
@@ -9,15 +9,12 @@
reset slave;
show slave status;
change master to master_host='127.0.0.1';
---replace_result 3306 9998 9306 9999 3334 9999 3335 9999
show slave status;
eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
slave start;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
show slave status;
connection master;
drop table if exists t1;
| Thread |
|---|
| • bk commit into 4.0 tree | sasha | 1 Dec |
