diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-11-23 12:26:19 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-11-23 12:26:19 +0200 |
| commit | 784b5d7b724acec0ada82587ffa7b5ac7144ced7 (patch) | |
| tree | 03241a63158659c5a63a0034f2f6c4a7a6b6c605 /sql/item_subselect.cc | |
| parent | 5f1966d1726a81a3951a365a3dfca68d869c1e7b (diff) | |
| parent | 3f163915bf4d7006f94a8c94814b7fdae3de03ad (diff) | |
| download | mariadb-git-784b5d7b724acec0ada82587ffa7b5ac7144ced7.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 423f067e54d..e2003f820b6 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1843,7 +1843,9 @@ int subselect_single_select_engine::exec() DBUG_RETURN(1); } } - if (select_lex->uncacheable && executed) + if (select_lex->uncacheable && + select_lex->uncacheable != UNCACHEABLE_EXPLAIN + && executed) { if (join->reinit()) { |