diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
| commit | 9a2f98198903de89ab08ce7906e4307fe5ad50a9 (patch) | |
| tree | 1cb84ff0f047fa8321330c5e4c52eca6424494de /sql/sql_lex.cc | |
| parent | 480a4852a01088cdc8638934f13469b6bf54effe (diff) | |
| parent | 5b6ebdf086fe0506dc1d2cb70a95f9633fd7a782 (diff) | |
| download | mariadb-git-9a2f98198903de89ab08ce7906e4307fe5ad50a9.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h
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 13f85b24299..f44edfdf6fb 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2194,6 +2194,7 @@ void 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; } |