diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 14:03:24 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 14:03:24 +0200 |
| commit | 0e8462315038a25d59bf3704ce3c5acf4256ec3d (patch) | |
| tree | c95d52d835f56ed35795f34e1988f370f6a3d102 /mysql-test/r/connect.result | |
| parent | 3eaaa154661a7dd19352abf9a2b4e2d62bfaeff7 (diff) | |
| download | mariadb-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/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 0e038cb3f09..d5b1cf4dd63 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,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,root,z,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES) -connect(localhost,root,z,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,root,z,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); 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,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,"",9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,"",MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,zorro,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) -connect(localhost,test,zorro,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); 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,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,zorro,test2,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) -connect(localhost,test,zorro,test,9306,MYSQL_TEST_DIR/var/tmp/master.sock); +connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) delete from mysql.user where user=_binary"test"; flush privileges; |