database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Enabled mysqltest for MASTER_PORT replacement.

Browse Source 
Replaced fixed port numbers by MASTER_PORT replacement.
This allows for a set of ports per tree and hence
parallel testing on multiple trees.


client/mysqltest.c:
  Enabled mysqltest for MASTER_PORT replacement.
mysql-test/r/rpl000014.result:
  Replaced fixed port numbers by MASTER_PORT.
mysql-test/r/rpl000015.result:
  Replaced fixed port numbers by MASTER_PORT.
mysql-test/r/rpl_rotate_logs.result:
  Replaced fixed port numbers by MASTER_PORT.
mysql-test/t/rpl000001.test:
  Replaced fixed port numbers by MASTER_PORT replacement.
  Just in case it might get un-commented.
mysql-test/t/rpl000014.test:
  Replaced fixed port numbers by MASTER_PORT replacement.
mysql-test/t/rpl000015.test:
  Replaced fixed port numbers by MASTER_PORT replacement.
mysql-test/t/rpl_rotate_logs.test:
  Replaced fixed port numbers by MASTER_PORT replacement.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2004-08-24 12:58:12 +02:00
parent 35d5744e8a
commit 7a48b79355
9 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/rpl000014.result
View File

@ -1,13 +1,13 @@
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 Yes 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 1 master-bin.001 73 No 0 0
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 No 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 Yes 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0
127.0.0.1 root MASTER_PORT 1 master-bin.001 173 Yes 0 0
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
n

6
mysql-test/r/rpl000015.result
View File

@ -3,11 +3,11 @@ master-bin.001 73
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
0 0 0 No 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 test 9998 60 4 No 0 0
127.0.0.1 test MASTER_PORT 60 4 No 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 4 No 0 0
127.0.0.1 root MASTER_PORT 60 4 No 0 0
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 master-bin.001 73 Yes 0 0
127.0.0.1 root MASTER_PORT 60 master-bin.001 73 Yes 0 0
n
10
45

6
mysql-test/r/rpl_rotate_logs.result
View File

@ -1,5 +1,5 @@
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 master-bin.001 387 Yes 0 0
127.0.0.1 root MASTER_PORT 60 master-bin.001 387 Yes 0 0
s
Could not break slave
Tried hard
@ -12,7 +12,7 @@ testing temporary tables
Log_name
master-bin.003
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 master-bin.003 329 Yes 0 0
127.0.0.1 root MASTER_PORT 60 master-bin.003 329 Yes 0 0
m
34
65
@ -29,6 +29,6 @@ master-bin.006 490
a
testing temporary tables part 2
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 master-bin.006 490 Yes 0 0
127.0.0.1 root MASTER_PORT 60 master-bin.006 490 Yes 0 0
count(*)
100

2
mysql-test/t/rpl000001.test
View File

@ -61,7 +61,7 @@ sleep 2;
# The following test can't be done because the result of Pos will differ
# on different computers
# --replace_result 9306 9999 3334 9999 3335 9999
# --replace_result $MASTER_MYPORT MASTER_PORT
# show slave status;
set sql_slave_skip_counter=1;

8
mysql-test/t/rpl000014.test
View File

@ -4,18 +4,18 @@ show master status;
save_master_pos;
connection slave;
sync_with_master;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
change master to master_log_pos=73;
slave stop;
change master to master_log_pos=73;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
slave start;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
change master to master_log_pos=173;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
connection master;
show master status;

6
mysql-test/t/rpl000015.test
View File

@ -8,15 +8,15 @@ connection slave;
reset slave;
show slave status;
change master to master_host='127.0.0.1';
--replace_result 3306 9998 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT
show slave status;
eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
slave start;
sync_with_master;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
connection master;
drop table if exists t1;

6
mysql-test/t/rpl_rotate_logs.test
View File

@ -40,7 +40,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
save_master_pos;
connection slave;
sync_with_master;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
select * from t1;
connection master;
@ -96,7 +96,7 @@ insert into t2 values (65);
save_master_pos;
connection slave;
sync_with_master;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
select * from t2;
@ -126,7 +126,7 @@ connection slave;
sync_with_master;
select * from t4;
--replace_result 9306 9999 3334 9999 3335 9999
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
# because of concurrent insert, the table may not be up to date
# if we do not lock