bk commit into 5.1 tree (df:1.2604)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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@stripped, 2007-09-18 17:56:47+02:00, df@stripped +2 -0
  fix one failure of test case rpl_innodb_bug28430

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2007-09-18 17:56:43+02:00, df@stripped +1 -1
    don't hard-code the port

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@stripped, 2007-09-18 17:56:43+02:00, df@stripped +1 -0
    replace the master's port by a symbolic constant

diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-09-09 05:26:07 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-09-18 17:56:43 +02:00
@@ -120,7 +120,7 @@ show slave status;
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	12000
+Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	945644
diff -Nrup a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test	2007-09-08 20:56:50 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test	2007-09-18 17:56:43 +02:00
@@ -140,6 +140,7 @@ SELECT count(*) as "Master byrange" FROM
 --sync_slave_with_master
 connection slave;
 show create table test.byrange_tbl;
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 SELECT count(*) "Slave norm" FROM test.regular_tbl;
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;