diff options
| author | unknown <joerg@mysql.com> | 2005-11-07 22:30:44 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-07 22:30:44 +0100 |
| commit | af2e0dc41a5d2005210ff14143a1a25cca4ffb57 (patch) | |
| tree | 77470ff46475dd736900ba6dfac2fb935c0abfb7 /mysql-test/r/connect.result | |
| parent | 1752d848dfdd32c52425c61f6bbc725d7d28f1c6 (diff) | |
| download | mariadb-git-af2e0dc41a5d2005210ff14143a1a25cca4ffb57.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/connect.result')
| -rw-r--r-- | mysql-test/r/connect.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index d5b1cf4dd63..4f49f77d46c 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -20,9 +20,9 @@ time_zone_transition_type user show tables; Tables_in_test -connect(localhost,root,z,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,root,z,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES) -connect(localhost,root,z,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,root,z,test,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES) grant ALL on *.* to test@localhost identified by "gambling"; grant ALL on *.* to test@127.0.0.1 identified by "gambling"; @@ -47,13 +47,13 @@ time_zone_transition_type user show tables; Tables_in_test -connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,"",MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,"",MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) -connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) update mysql.user set password=old_password("gambling2") where user=_binary"test"; flush privileges; @@ -82,13 +82,13 @@ time_zone_transition_type user show tables; Tables_in_test -connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) -connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) delete from mysql.user where user=_binary"test"; flush privileges; |