diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2010-12-09 18:07:59 +0300 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2010-12-09 18:07:59 +0300 |
commit | 1bf3964fbe00f7bcc5b9a55b54066d4081302b19 (patch) | |
tree | 47af31fd83d5a16145aaa21ae0564bfa277e4e54 /sql/opt_range.cc | |
parent | eb70e64ceaa7aec6a35580643a3e5fc01b6a0630 (diff) | |
parent | 8127e0a621782a848e37d6dc389436928fd39e3e (diff) | |
download | mariadb-git-1bf3964fbe00f7bcc5b9a55b54066d4081302b19.tar.gz |
MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries
- Merge into 5.3-main
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 9e903d3121b..f5650dc18a3 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2295,7 +2295,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, quick=0; needed_reg.clear_all(); quick_keys.clear_all(); - if (keys_to_use.is_clear_all()) + DBUG_ASSERT(!head->is_filled_at_execution()); + if (keys_to_use.is_clear_all() || head->is_filled_at_execution()) DBUG_RETURN(0); records= head->file->stats.records; if (!records) |