diff options
| author | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
|---|---|---|
| committer | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
| commit | d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3 (patch) | |
| tree | 8e1c37da4cf89e91d901badb1c2e5f100be39ec1 /sql/item_subselect.cc | |
| parent | 6accbba0c0fbe6d5154002c148ee02a475ead109 (diff) | |
| parent | d902f4d3d634fa17021ecd99cd8982cfb2352ffb (diff) | |
| download | mariadb-git-d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
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 614f30c48d7..46b8d2e46cc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1856,7 +1856,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()) { |