summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-06-06 16:28:22 +0300
committerunknown <bell@sanja.is.com.ua>2002-06-06 16:28:22 +0300
commit90ced85443e4563ab1a7f94581691d2b7e30bdaa (patch)
tree7498edfb6fcf77eeefa9cc20558a029c0f2fa4fe /sql/item_subselect.cc
parent4a1dec3dfbf750dab7fcd6a5c6785c28b96a3c65 (diff)
downloadmariadb-git-90ced85443e4563ab1a7f94581691d2b7e30bdaa.tar.gz
Prevent needless rexecuting empty subselects
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index e18c8d78830..fc0228455ff 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -36,7 +36,7 @@ SUBSELECT TODO:
#include "sql_select.h"
Item_subselect::Item_subselect(THD *thd, st_select_lex *select_lex):
- executed(0), optimized(0), error(0)
+ assigned(0), executed(0), optimized(0), error(0)
{
DBUG_ENTER("Item_subselect::Item_subselect");
DBUG_PRINT("subs", ("select_lex 0x%xl", (long) select_lex));
@@ -141,7 +141,7 @@ int Item_subselect::exec()
return 1;
}
assign_null();
- executed= 0;
+ executed= assigned= 0;
}
if (!executed)
{
@@ -149,6 +149,7 @@ int Item_subselect::exec()
join->thd->lex.select= select_lex;
join->exec();
join->thd->lex.select= save_select;
+ executed= 1;
return join->error;
}
return 0;