diff options
| author | evgen@moonbone.local <> | 2007-11-19 21:15:53 +0000 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-11-19 21:15:53 +0000 |
| commit | 6f6fe52ad230f4fe0556fe4295b3f1e438963812 (patch) | |
| tree | 7afc0e9867eddd807fb855e26ebe58b9d456b32e /sql/item_subselect.cc | |
| parent | fedeec6c8a14a96721b673cf624ec3d4556379e3 (diff) | |
| parent | 67cae0d48d4f70162f05eff1d2a8d63a63232acf (diff) | |
| download | mariadb-git-6f6fe52ad230f4fe0556fe4295b3f1e438963812.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/31048-bug-5.0-opt-mysql
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()) { |