summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <sergey.vojtovich@oracle.com>2010-12-17 19:08:05 +0300
committerSergey Vojtovich <sergey.vojtovich@oracle.com>2010-12-17 19:08:05 +0300
commita3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (patch)
tree87d38efca7d0ab7a6507ad450de9ce7a142f8481
parent883a36340b1ffad3c35f914243a209ba118b7702 (diff)
parentb9a0c8804a61c14bc31d9ee5eacfbaf980780ba6 (diff)
downloadmariadb-git-a3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974.tar.gz
Merge fix for BUG58948 to 5.5-bugteam.
-rw-r--r--sql/sql_class.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c4aa4ba7efb..c058e66df97 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3007,7 +3007,7 @@ void Security_context::init()
{
host= user= ip= external_user= 0;
host_or_ip= "connecting host";
- priv_user[0]= priv_host[0]= '\0';
+ priv_user[0]= priv_host[0]= proxy_user[0]= '\0';
master_access= 0;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
db_access= NO_ACCESS;