diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
| commit | b7b25dc666a8d331d16231f9fb658af8c05ac694 (patch) | |
| tree | 0c7798c2d187db0da7837a70f306a789afc16521 /sql/sql_prepare.cc | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| download | mariadb-git-b7b25dc666a8d331d16231f9fb658af8c05ac694.tar.gz | |
Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'
Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
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 7185b8ffdda..a1243589ed1 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2367,11 +2367,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 */ |