diff options
| author | bell@sanja.is.com.ua <> | 2003-01-28 14:48:12 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-01-28 14:48:12 +0200 |
| commit | 0c5b323d0f534605df9d6f8dc93a7044decccff2 (patch) | |
| tree | 627ebfbd22d44074e53cd22c32b38bd9aee3f9c3 /sql/sql_union.cc | |
| parent | 5469c014e3c6f4d0b79abfc00b2b222b430e0900 (diff) | |
| download | mariadb-git-0c5b323d0f534605df9d6f8dc93a7044decccff2.tar.gz | |
fixed bugs in temporary tables in subselect implementation (SCRUM)
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ffd6ac48c2c..259f6dbb4b5 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -207,11 +207,11 @@ int st_select_lex_unit::exec() DBUG_ENTER("st_select_lex_unit::exec"); SELECT_LEX_NODE *lex_select_save= thd->lex.current_select; - if (executed && !dependent) + if (executed && !(dependent||uncacheable)) DBUG_RETURN(0); executed= 1; - if (dependent || !item || !item->assigned()) + if ((dependent||uncacheable) || !item || !item->assigned()) { if (optimized && item && item->assigned()) { |