diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-07 16:12:42 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-07 16:12:42 +0500 |
| commit | 6e07c2e641303430c51098d1559dc28d31d4b578 (patch) | |
| tree | 1eb902b20bcaa743403f66b5240a9764c979f2ba /sql/item_subselect.cc | |
| parent | 42c714fd5f86a1dee317deb91f02994f97dffcef (diff) | |
| parent | 187ccf4bca5bf865fec86581d894fb8e6df0792a (diff) | |
| download | mariadb-git-6e07c2e641303430c51098d1559dc28d31d4b578.tar.gz | |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/sp-vars.result:
merging
mysql-test/r/type_datetime.result:
SCCS merged
mysql-test/t/type_datetime.test:
SCCS merged
sql/item_func.h:
merging
sql/mysql_priv.h:
merging
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 7d635ba444e..8f6503810fc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1830,7 +1830,7 @@ int subselect_single_select_engine::exec() select_lex->uncacheable|= UNCACHEABLE_EXPLAIN; select_lex->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN; if (join->init_save_join_tab()) - DBUG_RETURN(1); + DBUG_RETURN(1); /* purecov: inspected */ } if (item->engine_changed) { |