summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-20 15:18:46 +0300
committerunknown <monty@donna.mysql.fi>2001-04-20 15:18:46 +0300
commit4a7af05c7fdd23d5ec194531b6fdb5dcfb113868 (patch)
treea82d8683eb9e83050b873052f53cd7e717d2a572 /mysql-test
parentb61b56b2939eb45b89fa9de98f16bf4a6a158f51 (diff)
downloadmariadb-git-4a7af05c7fdd23d5ec194531b6fdb5dcfb113868.tar.gz
Portability fixes
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602: Delete: BUILD/compile-ia64-O0-sgicc BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1: Delete: BUILD/compile-ia64-O0 BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849: Delete: BUILD/compile-ia64-O2-sgicc BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830: Delete: BUILD/compile-ia64-O2 BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468: Delete: BUILD/compile-ia64-O6 Docs/manual.texi: Cleanup mysql-test/r/rpl000014.result: Change port number for comparison mysql-test/r/rpl000015.result: Change port number for comparison mysql-test/r/rpl000016.result: Change port number for comparison mysql-test/t/rpl000014.test: Change port number for comparison mysql-test/t/rpl000015.test: Change port number for comparison mysql-test/t/rpl000016.test: Change port number for comparison sql-bench/Results/ATIS-mysql-NT_4.0: New test results sql-bench/Results/RUN-mysql-NT_4.0: New test results sql-bench/Results/alter-table-mysql-NT_4.0: New test results sql-bench/Results/big-tables-mysql-NT_4.0: New test results sql-bench/Results/connect-mysql-NT_4.0: New test results sql-bench/Results/create-mysql-NT_4.0: New test results sql-bench/Results/insert-mysql-NT_4.0: New test results sql-bench/Results/select-mysql-NT_4.0: New test results sql-bench/Results/wisconsin-mysql-NT_4.0: New test results sql/slave.cc: Removed not used variable
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl000014.result8
-rw-r--r--mysql-test/r/rpl000015.result6
-rw-r--r--mysql-test/r/rpl000016.result6
-rw-r--r--mysql-test/t/rpl000014.test4
-rw-r--r--mysql-test/t/rpl000015.test3
-rw-r--r--mysql-test/t/rpl000016.test3
6 files changed, 20 insertions, 10 deletions
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index d2cb8ee5436..a47c3c91c1d 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -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 9306 1 master-bin.001 73 Yes 0 0
+127.0.0.1 root 9999 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 9306 1 master-bin.001 73 No 0 0
+127.0.0.1 root 9999 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 9306 1 master-bin.001 73 Yes 0 0
+127.0.0.1 root 9999 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 9306 1 master-bin.001 173 Yes 0 0
+127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
n
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 5899d76c82f..58487af27f8 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -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 3306 60 4 No 0 0
+127.0.0.1 test 9998 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 9306 60 4 No 0 0
+127.0.0.1 root 9999 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 9306 60 master-bin.001 73 Yes 0 0
+127.0.0.1 root 9999 60 master-bin.001 73 Yes 0 0
n
10
45
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index da9dccae9f4..abe4275a124 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -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 9306 60 master-bin.001 216 Yes 0 0
+127.0.0.1 root 9999 60 master-bin.001 216 Yes 0 0
s
Could not break slave
Tried hard
@@ -10,7 +10,7 @@ master-bin.003
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 9306 60 master-bin.003 184 Yes 0 0
+127.0.0.1 root 9999 60 master-bin.003 184 Yes 0 0
m
34
65
@@ -25,6 +25,6 @@ master-bin.006
File Position Binlog_do_db Binlog_ignore_db
master-bin.006 131
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 9306 60 master-bin.006 131 Yes 0 0
+127.0.0.1 root 9999 60 master-bin.006 131 Yes 0 0
count(*)
100
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index ca83342c41d..b501d63b10e 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -4,14 +4,18 @@ show master status;
save_master_pos;
connection slave;
sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
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
show slave status;
slave start;
+--replace_result 9306 9999 3334 9999 3335 9999
show slave status;
change master to master_log_pos=173;
+--replace_result 9306 9999 3334 9999 3335 9999
show slave status;
connection master;
show master status;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index b6e3ceaf419..73a10bed7b3 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -8,12 +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
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
show slave status;
slave start;
sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
show slave status;
connection master;
drop table if exists t1;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index b322858f388..7b46bc75498 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -22,6 +22,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
show slave status;
select * from t1;
connection master;
@@ -67,6 +68,7 @@ insert into t2 values (65);
save_master_pos;
connection slave;
sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
show slave status;
select * from t2;
connection master;
@@ -86,6 +88,7 @@ connection slave;
slave stop;
slave start;
sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
show slave status;
# because of concurrent insert, the table may not be up to date
# if we do not lock
View Lorry Controller Status