diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
| commit | b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/sql_prepare.cc | |
| parent | 7840965db9460e2117c163f3db83aaa247c65203 (diff) | |
| parent | 498ee6bd19eabc85dcbd9abebc9cf6aeb79d1985 (diff) | |
| download | mariadb-git-b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083.tar.gz | |
Merge with MySQL 5.1.52
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index cde5005b038..ffc3686fcd9 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2366,11 +2366,15 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) sl->where= sl->prep_where->copy_andor_structure(thd); sl->where->cleanup(); } + else + sl->where= NULL; if (sl->prep_having) { sl->having= sl->prep_having->copy_andor_structure(thd); sl->having->cleanup(); } + else + sl->having= NULL; DBUG_ASSERT(sl->join == 0); ORDER *order; /* Fix GROUP list */ |