diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
commit | 89dc445a55156881318ca94ce042dbaf98e53e26 (patch) | |
tree | 04da8a074a8ceac347cb21e0c6e2ee1d05a990c6 /sql/sql_class.cc | |
parent | 4d2131354914f54f85abf0bb8cb4bdd42d817f73 (diff) | |
parent | f305a7ce4bccbd56520d874e1d81a4f29bc17a96 (diff) | |
download | mariadb-git-89dc445a55156881318ca94ce042dbaf98e53e26.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 2 |
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); |