diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-29 14:48:57 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-29 14:48:57 +0300 |
| commit | 9d8098e0c6b0fee2456e8b561d47f025fb09327a (patch) | |
| tree | fd910c5a5197283ec0acc6b546e6cbb8bb9338e6 /sql/sql_prepare.cc | |
| parent | b5bc68c52441fa05f8f41fecf30684a16260452f (diff) | |
| parent | 55390725600c749c749381d45aa4c42af65d9c6e (diff) | |
| download | mariadb-git-9d8098e0c6b0fee2456e8b561d47f025fb09327a.tar.gz | |
merge
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 366c46d9c92..fcbf2c48896 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2420,11 +2420,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 */ |