From e46c42217f4fc7ba43992ca54c039f2556d1859f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 2 Feb 2017 00:47:07 +0100 Subject: cleanup: TABLE::mark_columns_used_by_index() mark_columns_used_by_index used to do reset + mark_columns_used_by_index_no_reset + start keyread + set bitmaps Now prepare_for_keyread does that, while mark_columns_used_by_index does only reset + mark_columns_used_by_index_no_reset, just as its name suggests. --- sql/key.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/key.cc') diff --git a/sql/key.cc b/sql/key.cc index 3bb009fcac9..bb10e902b8b 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -465,8 +465,7 @@ void key_unpack(String *to, TABLE *table, KEY *key) bool is_key_used(TABLE *table, uint idx, const MY_BITMAP *fields) { - bitmap_clear_all(&table->tmp_set); - table->mark_columns_used_by_index_no_reset(idx, &table->tmp_set); + table->mark_columns_used_by_index(idx, &table->tmp_set); return bitmap_is_overlapping(&table->tmp_set, fields); } -- cgit v1.2.1