diff options
| author | unknown <evgen@moonbone.local> | 2007-11-19 21:15:53 +0000 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-11-19 21:15:53 +0000 |
| commit | b3347a6a980d2ac0a8844cb82168ad40958e44e5 (patch) | |
| tree | 7afc0e9867eddd807fb855e26ebe58b9d456b32e /sql/item_subselect.cc | |
| parent | ea739898281a86c074275f2f0a084840d7ed3e44 (diff) | |
| parent | 13105534fa6107c5afb139a4459c659329525b2e (diff) | |
| download | mariadb-git-b3347a6a980d2ac0a8844cb82168ad40958e44e5.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/31048-bug-5.0-opt-mysql
sql/item_subselect.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
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 57c3b391507..b3710841dfb 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1800,7 +1800,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()) { |