summaryrefslogtreecommitdiff
path: root/mysql-test/t/connect.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-28 14:03:24 +0200
committerunknown <msvensson@neptunus.(none)>2005-10-28 14:03:24 +0200
commit0e8462315038a25d59bf3704ce3c5acf4256ec3d (patch)
treec95d52d835f56ed35795f34e1988f370f6a3d102 /mysql-test/t/connect.test
parent3eaaa154661a7dd19352abf9a2b4e2d62bfaeff7 (diff)
downloadmariadb-git-0e8462315038a25d59bf3704ce3c5acf4256ec3d.tar.gz
Use replace_result to mask portnumber printed from failing connect
mysql-test/r/connect.result: Update test result mysql-test/t/connect.test: Fix test to work also when no running on standard ports.
Diffstat (limited to 'mysql-test/t/connect.test')
-rw-r--r--mysql-test/t/connect.test20
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index 0bcd1d76d28..a867baa9fc9 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -17,10 +17,10 @@ show tables;
connect (con2,localhost,root,,test);
show tables;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,root,z,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,root,z,);
@@ -35,16 +35,16 @@ show tables;
connect (con4,localhost,test,gambling,test);
show tables;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,,"");
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,zorro,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,zorro,);
@@ -63,16 +63,16 @@ show tables;
connect (con6,localhost,test,gambling3,test);
show tables;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,,);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,zorro,test2);
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
--error 1045
connect (fail_con,localhost,test,zorro,);