summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2018-06-15 17:13:31 +0300
committerSergei Petrunia <psergey@askmonty.org>2018-06-15 17:14:58 +0300
commitf2c418079deff5fc0b460961094d8b833b4e30b4 (patch)
tree0468be8c0b52d0953b00f2e9490674f25b11d95f
parentf61909e19e58525583316f8edb55335f094af7dd (diff)
downloadmariadb-git-f2c418079deff5fc0b460961094d8b833b4e30b4.tar.gz
Fix a typo in get_best_ror_intersect
cpk_scan should not be used if using it increases the cost of the query plan.
-rw-r--r--sql/opt_range.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 8422917065f..d3f8acd8350 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -6529,6 +6529,8 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree,
if (ror_intersect_add(intersect, cpk_scan, TRUE) &&
(intersect->total_cost < min_cost))
intersect_best= intersect; //just set pointer here
+ else
+ cpk_scan= 0; // Don't use cpk_scan
}
else
cpk_scan= 0; // Don't use cpk_scan