summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-11-16 14:04:49 +0100
committerSergei Golubchik <serg@mariadb.org>2016-12-12 20:27:37 +0100
commit54ab7db733d91b27ca2aec316cea4a3c2afa86a5 (patch)
treecf84f6187fdb6f898e16361585ea707071b955ee /sql/table.h
parentb38ff28ade620b816c62f3df5edd739c779ad023 (diff)
downloadmariadb-git-54ab7db733d91b27ca2aec316cea4a3c2afa86a5.tar.gz
cleanup: remove now-unused TABLE::merge_keys
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h
index 27439670a22..344655ebbbc 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1042,7 +1042,7 @@ public:
needed by the query without reading the row.
*/
key_map covering_keys;
- key_map quick_keys, merge_keys,intersect_keys;
+ key_map quick_keys, intersect_keys;
/*
A set of keys that can be used in the query that references this
table.