diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
| commit | 38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch) | |
| tree | b33dfb00e00ec3f4473c088305871021f437ee46 /sql/set_var.cc | |
| parent | 623ed1946215e25682847ac3b0ea066cab35ea59 (diff) | |
| parent | 052c9e392e6d9b770511c88cfec05ef606bff2ed (diff) | |
| download | mariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 34b66dea319..4313dcce917 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -746,9 +746,9 @@ int set_var_password::check(THD *thd) } if (!user->user.str) { - DBUG_ASSERT(thd->security_ctx->priv_user); - user->user.str= (char *) thd->security_ctx->priv_user; - user->user.length= strlen(thd->security_ctx->priv_user); + DBUG_ASSERT(thd->security_ctx->user); + user->user.str= (char *) thd->security_ctx->user; + user->user.length= strlen(thd->security_ctx->user); } /* Returns 1 as the function sends error to client */ return check_change_password(thd, user->host.str, user->user.str, |