diff options
| author | unknown <lenz@mysql.com> | 2003-07-11 22:18:53 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-07-11 22:18:53 +0200 |
| commit | 1c5773add420572a012d9f2d8e382dc15e5e1107 (patch) | |
| tree | a59572c358208ab08b4e377cc0cfc8aff0753336 /mysql-test | |
| parent | aa28da79c1c4b59f7e4693cba5273472734a3045 (diff) | |
| download | mariadb-git-1c5773add420572a012d9f2d8e382dc15e5e1107.tar.gz | |
- fixed an error in the rpl_error_ignored_table test suite: the master
port number can be different from 3306 when doing the release builds
with Do-compile, therefore it has to be replaced with the correct
value during the test run using the "--replace_result" function.
mysql-test/r/rpl_error_ignored_table.result:
- replaced hard-coded master port number with MASTER_PORT variable, since
the port number is different when running the test suite during the
release builds with "Do-compile".
mysql-test/t/rpl_error_ignored_table.test:
- replaced hard-coded master port number with MASTER_PORT variable, since
the port number is different when running the test suite during the
release builds with "Do-compile".
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_error_ignored_table.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_error_ignored_table.test | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result index 826e97a8004..e1486220542 100644 --- a/mysql-test/r/rpl_error_ignored_table.result +++ b/mysql-test/r/rpl_error_ignored_table.result @@ -9,7 +9,7 @@ insert into t1 values (1),(1); Duplicate entry '1' for key 1 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 9306 1 master-bin.001 213 slave-relay-bin.002 254 master-bin.001 Yes Yes 0 0 213 254 +127.0.0.1 root MASTER_PORT 1 master-bin.001 213 slave-relay-bin.002 254 master-bin.001 Yes Yes 0 0 213 254 show tables like 't1'; Tables_in_test (t1) drop table t1; diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test index caa289a184d..686472433eb 100644 --- a/mysql-test/t/rpl_error_ignored_table.test +++ b/mysql-test/t/rpl_error_ignored_table.test @@ -12,6 +12,9 @@ save_master_pos; connection slave; # as the t1 table is ignored on the slave, the slave should be able to sync sync_with_master; +# The port number is different when doing the release build with +# Do-compile, hence we have to replace the port number here accordingly +--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT show slave status; # check that the table has been ignored, because otherwise the test is nonsense show tables like 't1'; |