summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-01-25 00:26:40 +0400
committerSergey Petrunya <psergey@askmonty.org>2014-01-25 00:26:40 +0400
commit669c6620af9a9996a66ca9b339d4fb05eb6bf944 (patch)
treed19180b17a4d623dab6c92776d4a2bd85060485a /sql
parentd106dc059746157239d951551093fec049a7b73a (diff)
downloadmariadb-git-669c6620af9a9996a66ca9b339d4fb05eb6bf944.tar.gz
[Backport to 5.3]
MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_condition_pushdown=on - in test_if_skip_sort_order(), correct the condition under which we have the code that restores the previously pushed index condition.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 289b75b5804..3e5652f2a16 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -19091,7 +19091,7 @@ check_reverse_order:
tab->limit= best_select_limit;
}
}
- else if (tab->type != JT_ALL)
+ else if (tab->type != JT_ALL || tab->select->quick)
{
/*
We're about to use a quick access to the table.