summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-01-24 23:40:48 +0400
committerSergey Petrunya <psergey@askmonty.org>2014-01-24 23:40:48 +0400
commite1f94a69858e9ca35e30d748f37ba3d1b6da8e7c (patch)
treeb4b984c1c11d2091021f14c97937db1c7e92655e /sql/sql_select.cc
parenteb88c905e68ee5d3ac0b5decc083de9e06c4eb0b (diff)
downloadmariadb-git-e1f94a69858e9ca35e30d748f37ba3d1b6da8e7c.tar.gz
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/sql_select.cc')
-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 dfbf5e144e5..cbca58673dd 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -19477,7 +19477,7 @@ check_reverse_order:
table->disable_keyread();
}
}
- 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.