diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-28 14:48:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-28 14:48:12 +0200 |
| commit | ca0d06d599c7e174927a75720974dc457968be23 (patch) | |
| tree | 627ebfbd22d44074e53cd22c32b38bd9aee3f9c3 /sql/sql_union.cc | |
| parent | 42ba47184c0394b682d4873d5bea4d31e2438b6a (diff) | |
| download | mariadb-git-ca0d06d599c7e174927a75720974dc457968be23.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
mysql-test/r/subselect.result:
changes in subselect test after switching on static tables optimization
fixed bug test added
uncacheable subselects
mysql-test/t/subselect.test:
changes in subselect test after switching on static tables optimization
fixed bug test added
uncacheable subselects
sql/item_create.cc:
fixed subselects with uncacheable results
sql/item_func.cc:
fixed subselects with uncacheable results
sql/item_subselect.cc:
fixed subselects with uncacheable results
clean up
sql/item_subselect.h:
fixed subselects with uncacheable results
sql/sql_lex.cc:
fixed subselects with uncacheable results
sql/sql_lex.h:
fixed subselects with uncacheable results
sql/sql_select.cc:
fixed bugs in temporary tables in subselect implementation
fixed subselects with uncacheable results
sql/sql_union.cc:
fixed subselects with uncacheable results
sql/sql_yacc.yy:
fixed subselects with uncacheable results
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()) { |