cannot use lex->grant_user= &current_user, where LEX_USER current_user is a global constant,

because parser might modify the lex->user (e.g. set lex->user-password).
switch to use LEX_STRING current_user string, and also change other similar constants
to be LEX_STRING's for consistency.

1 files changed, 2 insertions, 5 deletions

diff --git a/sql/set_var.cc b/sql/set_var.cc
index 33c360ae785..4eb53dd04f4 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -841,12 +841,9 @@ int set_var_password::check(THD *thd)
       user->host.length= strlen(thd->security_ctx->priv_host);
     }
     else
-    {
-      user->host.str= (char *)"%";
-      user->host.length= 1;
-    }
+      user->host= host_not_specified;
   }
-  if (!user->user.str)
+  if (user->user.str == current_user.str)
   {
     DBUG_ASSERT(thd->security_ctx->user);
     user->user.str= (char *) thd->security_ctx->user;