diff options
| author | kaa@polly.(none) <> | 2007-11-12 12:29:20 +0300 |
|---|---|---|
| committer | kaa@polly.(none) <> | 2007-11-12 12:29:20 +0300 |
| commit | bf2a90f14ba4504a966a8c5e79738e044d3bbea8 (patch) | |
| tree | 7e3341aa5f4809d424cd15e65eb8e4e637ed4950 /sql | |
| parent | 3847b1b2eb588b360ddf79a5771dee771c7e8922 (diff) | |
| parent | 4aa04022245ca0ec4186683ea2c8ef7399db7055 (diff) | |
| download | mariadb-git-bf2a90f14ba4504a966a8c5e79738e044d3bbea8.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug30666/my50-bug29131
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 57d6e9e3739..65d4f2df8c1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6088,10 +6088,9 @@ make_join_readinfo(JOIN *join, ulonglong options) ordered. If there is a temp table the ordering is done as a last operation and doesn't prevent join cache usage. */ - if (!ordered_set && !join->need_tmp && - ((table == join->sort_by_table && - (!join->order || join->skip_sort_order)) || - (join->sort_by_table == (TABLE *) 1 && i != join->const_tables))) + if (!ordered_set && !join->need_tmp && + (table == join->sort_by_table || + (join->sort_by_table == (TABLE *) 1 && i != join->const_tables))) ordered_set= 1; switch (tab->type) { |