diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-25 00:20:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-25 00:20:53 +0100 |
| commit | 82c022f2d54813bc0d4b77d23b714c0806b42f73 (patch) | |
| tree | 845531c68c7b1e4ceb3e73d82c4afccb3af961c9 | |
| parent | bfc71e63a77972fa4ab934855b6ab712bea323a1 (diff) | |
| download | mariadb-git-82c022f2d54813bc0d4b77d23b714c0806b42f73.tar.gz | |
report "using password: YES/NO" correctly for the COM_CHANGE_USER failures
| -rw-r--r-- | mysql-test/r/change_user_notembedded.result | 4 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/change_user_notembedded.result b/mysql-test/r/change_user_notembedded.result index 506a463d6d2..60579d15ec2 100644 --- a/mysql-test/r/change_user_notembedded.result +++ b/mysql-test/r/change_user_notembedded.result @@ -1,5 +1,5 @@ +ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES) ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO) -ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO) -ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO) +ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES) ERROR 08S01: Unknown command ERROR 08S01: Unknown command diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 1005f5d8688..547572c5db6 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -7471,6 +7471,7 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, uint packet_length) } #ifndef NO_EMBEDDED_ACCESS_CHECKS + thd->password= passwd_len > 0; if (find_mpvio_user(mpvio, sctx)) return 1; |