diff options
| author | unknown <guilhem@mysql.com> | 2004-04-28 23:46:16 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-04-28 23:46:16 +0200 |
| commit | c008eb042584dbb9a837569da12ac4de3f86096e (patch) | |
| tree | 958b98cf5064587ad4a1babb4a34464b1fe8fab6 /mysql-test | |
| parent | d30a350d7ab8e7bfcd694b92d3fdd878d4104f1a (diff) | |
| parent | 2a5d6bdc3955936f97bfd067eae7b2f9a30f87fb (diff) | |
| download | mariadb-git-c008eb042584dbb9a837569da12ac4de3f86096e.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_server_id1.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_server_id2.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_error_ignored_table.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_server_id1.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_server_id2.test | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_server_id1.result b/mysql-test/r/rpl_server_id1.result index a8b2af7ff11..d8b23b9ca41 100644 --- a/mysql-test/r/rpl_server_id1.result +++ b/mysql-test/r/rpl_server_id1.result @@ -8,7 +8,7 @@ drop table if exists t1; create table t1 (n int); reset master; stop slave; -change master to master_port=9307; +change master to master_port=SLAVE_PORT; 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 SLAVE_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 # diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index 0f484865d7e..5f4ec9df4c4 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -8,7 +8,7 @@ drop table if exists t1; create table t1 (n int); reset master; stop slave; -change master to master_port=9307; +change master to master_port=SLAVE_PORT; 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 SLAVE_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 # diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test index 703e302c7b5..4f15f9de0a2 100644 --- a/mysql-test/t/rpl_error_ignored_table.test +++ b/mysql-test/t/rpl_error_ignored_table.test @@ -39,7 +39,7 @@ insert into t3 values(connection_id()); send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10); connection master1; -sleep 2; +real_sleep 2; select (@id := id) - id from t3; kill @id; drop table t2,t3; diff --git a/mysql-test/t/rpl_server_id1.test b/mysql-test/t/rpl_server_id1.test index 551d8432cd8..1bd4d9547c7 100644 --- a/mysql-test/t/rpl_server_id1.test +++ b/mysql-test/t/rpl_server_id1.test @@ -8,6 +8,7 @@ create table t1 (n int); reset master; # replicate ourselves stop slave; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_port=$SLAVE_MYPORT; --replace_result $SLAVE_MYPORT SLAVE_PORT --replace_column 18 # diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/t/rpl_server_id2.test index 2967cb19932..f022ab13188 100644 --- a/mysql-test/t/rpl_server_id2.test +++ b/mysql-test/t/rpl_server_id2.test @@ -8,6 +8,7 @@ create table t1 (n int); reset master; # replicate ourselves stop slave; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_port=$SLAVE_MYPORT; --replace_result $SLAVE_MYPORT SLAVE_PORT --replace_column 18 # |