From af2e0dc41a5d2005210ff14143a1a25cca4ffb57 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Nov 2005 22:30:44 +0100 Subject: mysql-test/r/connect.result + mysql-test/t/connect.test Replace the full socket path name, not just a directory component. bug#14720 mysql-test/r/connect.result: In cases where "--tmpdir=" is given to the test run, the socket file is not created below "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not be done to a directory in the path but rather to the complete path name of the socket file. bug#14720 mysql-test/t/connect.test: In cases where "--tmpdir=" is given to the test run, the socket file is not created below "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not be done to a directory in the path but rather to the complete path name of the socket file. bug#14720 --- mysql-test/t/connect.test | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'mysql-test/t/connect.test') diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index a867baa9fc9..fef9d4552e6 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 $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,root,z,test2); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $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 $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,test2); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,""); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,zorro,test2); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $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 $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,test2); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,zorro,test2); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,zorro,); -- cgit v1.2.1