diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
| commit | 1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch) | |
| tree | a0c58838a4dd7bdf2ed4d739563da27727ada7b0 /sql/sql_prepare.cc | |
| parent | b2e979d868d5d5964d58c97ed9580e07f6123217 (diff) | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz | |
merge with 5.1
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 bf1632d1d53..98434439998 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 */ |