diff options
| author | unknown <mleich@four.local.lan> | 2007-11-30 18:06:28 +0100 |
|---|---|---|
| committer | unknown <mleich@four.local.lan> | 2007-11-30 18:06:28 +0100 |
| commit | 56b009412d3c82dacd9e63bdcd9adf8e54aebb35 (patch) | |
| tree | 23f467a3a12f0f312755b75a94729698376f4226 | |
| parent | ee85ee6218e0cee0692e4740fd4a95c5148af7fa (diff) | |
| download | mariadb-git-56b009412d3c82dacd9e63bdcd9adf8e54aebb35.tar.gz | |
Fix for
Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
This bug does not occur in MySQL 5.0 and up, because
ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
which is set by mysql-test-run.pl.
mysql-test-run.pl in 4.1 does not set this variable.
There are two alternatives:
1) Backport the 5.0 fix for this test including modifications
to mysql-test-run.pl and mysql-test-run-shell.
This is a not acceptable impact on an old MySQL version.
2) Fix the problem different than in 5.0 like in the current
ChangeSet + do not apply these changes when upmerging to 5.0
mysql-test/r/rpl000015.result:
Updated result
mysql-test/t/disabled.def:
Enable rpl000015
mysql-test/t/rpl000015.test:
Unify the MASTER_PORT number
| -rw-r--r-- | mysql-test/r/rpl000015.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.test | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index b3e6ef71e45..64172b4ade9 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -8,7 +8,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File change master to master_host='127.0.0.1'; show slave status; Slave_IO_State 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 Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 test MASTER_PORT 7 4 # # No No 0 0 0 # None 0 No # +# 127.0.0.1 test # 7 4 # # No No 0 0 0 # None 0 No # change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=MASTER_PORT; show slave status; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 80b28e11da6..9bfe9567d83 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -10,4 +10,3 @@ # ############################################################################## -rpl000015 : Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306 diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index a23a4b0ba5f..6f43e4525df 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -13,7 +13,7 @@ show slave status; change master to master_host='127.0.0.1'; # The following needs to be cleaned up when change master is fixed --replace_result $MASTER_MYPORT MASTER_PORT $MYSQL_TCP_PORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 4 # 8 # 9 # 23 # 33 # show slave status; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root', |