diff options
| author | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
| commit | 35b2883643e337a8ec9c3cf7494363ae9889119c (patch) | |
| tree | eb2e7d833ed965b30f8b8485cfdac31abfea6c97 /sql/sys_vars.h | |
| parent | dafa458262fb47a2c9534bcc36088b15e26307c2 (diff) | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| download | mariadb-git-35b2883643e337a8ec9c3cf7494363ae9889119c.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index d68761d91ca..260a8af8384 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -428,7 +428,10 @@ public: void cleanup() { if (flags & ALLOCATED) + { my_free(global_var(char*)); + global_var(char *)= NULL; + } flags&= ~ALLOCATED; } static bool do_string_check(THD *thd, set_var *var, CHARSET_INFO *charset) |