diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
| commit | 13569e915c65003cc773cb0e47dcd4ba74daa1ec (patch) | |
| tree | da42637b1ae9402a7436b715f9c0db57cdddc87a /sql/sql_lex.cc | |
| parent | 5b2e9c5d9020d39921f0270e341274761deadc8d (diff) | |
| parent | b8b0293abe1ce16cd2ada405e0a47782293310d9 (diff) | |
| download | mariadb-git-13569e915c65003cc773cb0e47dcd4ba74daa1ec.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 63ff2e05817..51a87a3aa60 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2126,6 +2126,7 @@ void st_lex::cleanup_lex_after_parse_error(THD *thd) */ if (thd->lex->sphead) { + thd->lex->sphead->restore_thd_mem_root(thd); delete thd->lex->sphead; thd->lex->sphead= NULL; } |