diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 12:26:19 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 12:26:19 +0200 |
| commit | c00bfc3bee2c7851a43d026783fcc931e42cb754 (patch) | |
| tree | 03241a63158659c5a63a0034f2f6c4a7a6b6c605 /sql/item_subselect.cc | |
| parent | a44d52b8f43dd040220021a6e6b625449c89cf67 (diff) | |
| parent | a197c4e95ddd69cf9ebe3a6b2796a68f420c009a (diff) | |
| download | mariadb-git-c00bfc3bee2c7851a43d026783fcc931e42cb754.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/gis.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/type_bit.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/subselect.result:
null merge. resolve latete.
mysql-test/t/subselect.test:
merge 5.0-opt -> 5.1-opt
sql/key.cc:
merge 5.0-opt -> 5.1-opt
sql/sql_class.h:
merge 5.0-opt -> 5.1-opt
sql/sql_insert.cc:
merge 5.0-opt -> 5.1-opt
sql/sql_table.cc:
merge 5.0-opt -> 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()) { |