report "using password: YES/NO" correctly for the COM_CHANGE_USER failures

82c022f2 · Sergei Golubchik · bfc71e63 · 82c022f2 · 82c022f2
Commit 82c022f2 authored Jan 25, 2013 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

mysql-test/r/change_user_notembedded.result mysql-test/r/change_user_notembedded.result +2 -2

sql/sql_acl.cc sql/sql_acl.cc +1 -0

No files found.
--- a/mysql-test/r/change_user_notembedded.result
+++ b/mysql-test/r/change_user_notembedded.result
+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
--- 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;