summaryrefslogtreecommitdiff
path: root/sql/sql_select.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
commit79533975b1453a716dce3a4b3936740ee22d92d9 (patch)
treeed274b7466c7617feeb74030a1c60751ff018af5 /sql/sql_select.cc
parent8fed6653de2c298704f9ee74f96f17184af46b45 (diff)
downloadmariadb-git-79533975b1453a716dce3a4b3936740ee22d92d9.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_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 9d19ab1e470..745f19d0bcf 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9041,10 +9041,12 @@ int mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result)
((sl == first)?
((sl->linkage == DERIVED_TABLE_TYPE) ?
"DERIVED":
- ((sl->dependent)?"DEPENDENT SUBQUERY":
+ ((sl->uncacheable & UNCACHEABLE_DEPENDENT)?
+ "DEPENDENT SUBQUERY":
(sl->uncacheable?"UNCACHEABLE SUBQUERY":
"SUBQUERY"))):
- ((sl->dependent)?"DEPENDENT UNION":
+ ((sl->uncacheable & UNCACHEABLE_DEPENDENT)?
+ "DEPENDENT UNION":
sl->uncacheable?"UNCACHEABLE UNION":
"UNION"))),
result);