diff options
| author | unknown <kostja@bodhi.local> | 2007-03-07 14:10:01 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-03-07 14:10:01 +0300 |
| commit | db3e45e6a56b85de69736846cf7c505aff2343f3 (patch) | |
| tree | 6cd30114f459431b7f11ac87e9c1bc343953f5cc /sql | |
| parent | 676b59cffa5b3019a0fc6179a1aa6d583aad29fb (diff) | |
| parent | 4d6e16f284d9699307461b0081269bf4ce8be87e (diff) | |
| download | mariadb-git-db3e45e6a56b85de69736846cf7c505aff2343f3.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into bodhi.local:/opt/local/work/mysql-5.1-runtime
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 97021b9a748..ef1f0592051 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1690,7 +1690,7 @@ void st_lex::cleanup_lex_after_parse_error(THD *thd) Sic: we must nullify the member of the main lex, not the current one that will be thrown away */ - if (thd->lex->sphead); + if (thd->lex->sphead) { delete thd->lex->sphead; thd->lex->sphead= NULL; |