bk commit into 4.0 tree

Below is the list of changes that have just been committed into a local
4.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1303 02/09/23 16:34:49 monty@xxxxxxxxxxxxxxx +2 -0
  Made mysql-test results independent of MASTER_PORT and SLAVE_PORT

  mysql-test/t/rpl_flush_log_loop.test
    1.2 02/09/23 16:34:47 monty@xxxxxxxxxxxxxxx +3 -0
    Made results independent of MASTER_PORT and SLAVE_PORT

  mysql-test/r/rpl_flush_log_loop.result
    1.3 02/09/23 16:34:47 monty@xxxxxxxxxxxxxxx +3 -3
    Made results independent of MASTER_PORT and SLAVE_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: monty
# Host: mashka.mysql.fi
# Root: /home/my/mysql-4.0

--- 1.2/mysql-test/r/rpl_flush_log_loop.result  Sun Sep 15 01:17:17 2002
+++ 1.3/mysql-test/r/rpl_flush_log_loop.result  Mon Sep 23 16:34:47 2002
@@ -5,13 +5,13 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 slave start;
 change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=9306;
+master_password='',master_port=MASTER_PORT;
 slave start;
 slave stop;
 change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=9307;
+master_password='',master_port=SLAVE_PORT;
 slave start;
 flush logs;
 show slave status;
 Master_Host    Master_User     Master_Port     Connect_retry   Master_Log_File 
Read_Master_Log_Pos     Relay_Log_File  Relay_Log_Pos   Relay_Master_Log_File   
Slave_IO_Running        Slave_SQL_Running       Replicate_do_db 
Replicate_ignore_db     Last_errno      Last_error      Skip_counter    
Exec_master_log_pos     Relay_log_space
-127.0.0.1      root    9307    60      slave-bin.001   79      relay-log.001   
119     slave-bin.001   Yes     Yes                     0               0       
79      119
+127.0.0.1      root    SLAVE_PORT      60      slave-bin.001   79      
relay-log.001   119     slave-bin.001   Yes     Yes                     0       
        0       79      119

--- 1.1/mysql-test/t/rpl_flush_log_loop.test    Wed Sep 11 06:40:06 2002
+++ 1.2/mysql-test/t/rpl_flush_log_loop.test    Mon Sep 23 16:34:47 2002
@@ -4,14 +4,17 @@
 source include/master-slave.inc
 
 connection slave;
+--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;
 slave start;
 connection master;
 slave stop;
+--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;
 slave start;
 flush logs;
 sleep 5;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 show slave status;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread4790@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>