summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-07-06 23:47:33 +0200
committerSergei Golubchik <serg@mariadb.org>2017-07-06 23:47:33 +0200
commit89dc445a55156881318ca94ce042dbaf98e53e26 (patch)
tree04da8a074a8ceac347cb21e0c6e2ee1d05a990c6 /sql/sql_class.cc
parent4d2131354914f54f85abf0bb8cb4bdd42d817f73 (diff)
parentf305a7ce4bccbd56520d874e1d81a4f29bc17a96 (diff)
downloadmariadb-git-89dc445a55156881318ca94ce042dbaf98e53e26.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_class.cc')
-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 0b016f7d816..bebdd82ea83 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3874,7 +3874,7 @@ void Security_context::destroy()
if (external_user)
{
my_free(external_user);
- user= NULL;
+ external_user= NULL;
}
my_free(ip);