summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-11-17 20:53:40 +0200
committerunknown <bell@sanja.is.com.ua>2003-11-17 20:53:40 +0200
commit5b4fcb8e6c84d36d18dbfb37af8cf9e690d6e708 (patch)
treeed274b7466c7617feeb74030a1c60751ff018af5 /sql/sql_union.cc
parent2ccf418e894e03d51f1c7a9751fcbd21eb00bb5c (diff)
downloadmariadb-git-5b4fcb8e6c84d36d18dbfb37af8cf9e690d6e708.tar.gz
fixed using 'uncachable' tag and RAND_TABLE_BIT setting
sql/item_create.cc: specify cause of uncachability sql/item_func.cc: specify cause of uncachability sql/item_subselect.cc: fixed setting RAND_TABLE_BIT specify cause of uncachability sql/item_subselect.h: used one field for all uncachability causes sql/mysql_priv.h: causes of uncachability sql/sql_lex.cc: specify cause of uncachability sql/sql_lex.h: used one field for all uncachability causes sql/sql_select.cc: used one field for all uncachability causes sql/sql_union.cc: used one field for all uncachability causes sql/sql_yacc.yy: specify cause of uncachability
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 93541d66d65..5292299f928 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -249,11 +249,11 @@ int st_select_lex_unit::exec()
ulonglong add_rows=0;
DBUG_ENTER("st_select_lex_unit::exec");
- if (executed && !(dependent || uncacheable))
+ if (executed && !uncacheable)
DBUG_RETURN(0);
executed= 1;
- if ((dependent || uncacheable) || !item || !item->assigned())
+ if (uncacheable || !item || !item->assigned())
{
if (optimized && item && item->assigned())
{