diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-05 14:35:03 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-05 14:35:03 +0100 |
| commit | 0183d4d8422ba29a632eebb1e856391f2b9a289f (patch) | |
| tree | 2cb1302c91d16e93480a8f9ab9dc7d6672071262 /mysql-test/t/connect.test | |
| parent | 62d5d85c5d19b113b772ecadbf32f198831b543b (diff) | |
| parent | 140cc614c944154282fce87064f5e3552406a14c (diff) | |
| download | mariadb-git-0183d4d8422ba29a632eebb1e856391f2b9a289f.tar.gz | |
Merge of fix for Bug#42003 and Bug#43114 into more actual GCA tree
modifications according to the reviews are included
Diffstat (limited to 'mysql-test/t/connect.test')
| -rw-r--r-- | mysql-test/t/connect.test | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index 2147d5b71af..c3a14964bb7 100644 --- a/mysql-test/t/connect.test +++ b/mysql-test/t/connect.test @@ -18,12 +18,16 @@ connect (con2,localhost,root,,test); show tables; --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,root,z,test2); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,root,z,); +connection default; +disconnect con1; +disconnect con2; + grant ALL on *.* to test@localhost identified by "gambling"; grant ALL on *.* to test@127.0.0.1 identified by "gambling"; @@ -35,20 +39,23 @@ show tables; connect (con4,localhost,test,gambling,test); show tables; +connection default; +disconnect con3; +disconnect con4; + --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,,test2); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,,""); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,zorro,test2); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,zorro,); - # check if old password version also works update mysql.user set password=old_password("gambling2") where user=_binary"test"; flush privileges; @@ -57,30 +64,34 @@ connect (con10,localhost,test,gambling2,); connect (con5,localhost,test,gambling2,mysql); connection con5; set password=""; ---error 1372 +--error ER_PASSWD_LENGTH set password='gambling3'; set password=old_password('gambling3'); show tables; connect (con6,localhost,test,gambling3,test); show tables; +connection default; +disconnect con10; +disconnect con5; +disconnect con6; + --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,,test2); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,,); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,zorro,test2); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT ---error 1045 +--error ER_ACCESS_DENIED_ERROR connect (fail_con,localhost,test,zorro,); # remove user 'test' so that other tests which may use 'test' # do not depend on this test. - delete from mysql.user where user=_binary"test"; flush privileges; @@ -98,4 +109,5 @@ disconnect con7; connection default; drop table t1; + # End of 4.1 tests |