diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 11:41:40 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 11:41:40 -0700 |
| commit | ac6877d420a70e215c59f1c85cfe80c6a71cf349 (patch) | |
| tree | eacddfe96382dcd8f07d60b5e171049381247c58 /mysql-test | |
| parent | 4cc8cda346bdd63c7e3882d687ba01143856b5dd (diff) | |
| download | mariadb-git-ac6877d420a70e215c59f1c85cfe80c6a71cf349.tar.gz | |
SET PASSWORD bugfixes:
* work as documented, use CURRENT_USER()
* move the check for ER_PASSWORD_ANONYMOUS_USER where it can actually work
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/grant2.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/plugin_auth.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/grant2.test | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 196f6601d48..da24f454564 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -335,7 +335,7 @@ delete from mysql.user where user like 'mysqltest\_1'; flush privileges; drop database mysqltest_1; set password = password("changed"); -ERROR 42000: Can't find any matching row in the user table +ERROR 42000: You are using MariaDB as an anonymous user and anonymous users are not allowed to change passwords lock table mysql.user write; flush privileges; grant all on *.* to 'mysqltest_1'@'localhost'; diff --git a/mysql-test/r/plugin_auth.result b/mysql-test/r/plugin_auth.result index a58fea2fe5b..ac5eaa4460b 100644 --- a/mysql-test/r/plugin_auth.result +++ b/mysql-test/r/plugin_auth.result @@ -36,8 +36,6 @@ USER() CURRENT_USER() plug@localhost plug_dest@% ## test SET PASSWORD SET PASSWORD = PASSWORD('plug_dest'); -Warnings: -Note 1699 SET PASSWORD has no significance for users authenticating via plugins ## test bad credentials ERROR 28000: Access denied for user 'plug'@'localhost' (using password: YES) ## test bad default plugin : should get CR_AUTH_PLUGIN_CANNOT_LOAD @@ -426,8 +424,6 @@ SELECT USER(),CURRENT_USER(); USER() CURRENT_USER() bug12818542@localhost bug12818542_dest@localhost SET PASSWORD = PASSWORD('bruhaha'); -Warnings: -Note 1699 SET PASSWORD has no significance for users authenticating via plugins SELECT USER(),CURRENT_USER(); USER() CURRENT_USER() bug12818542@localhost bug12818542_dest@localhost diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index 6c2ba0dd6fc..51329893b3b 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -405,7 +405,7 @@ drop database mysqltest_1; # But anonymous users can't change their password connect (n5,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection n5; ---error ER_PASSWORD_NO_MATCH +--error ER_PASSWORD_ANONYMOUS_USER set password = password("changed"); disconnect n5; connection default; |