diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-11-16 18:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-11-20 15:05:52 +0100 |
| commit | 1823ce7304b3fc9328181476319a53824b81626c (patch) | |
| tree | 8c41d2d3f9d1cb62b0ebc98705fff150e6d6c2ad /sql | |
| parent | 649465db411cc853e6dce06e107fac023659148d (diff) | |
| download | mariadb-git-1823ce7304b3fc9328181476319a53824b81626c.tar.gz | |
cleanup: rename a flag, keep old name for compatibility
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 2 | ||||
| -rw-r--r-- | sql/handler.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 2115c39339c..d566652f5f8 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5281,7 +5281,7 @@ bool ha_partition::init_record_priority_queue() /* Initialize priority queue, initialized to reading forward. */ int (*cmp_func)(void *, uchar *, uchar *); void *cmp_arg= (void*) this; - if (!m_using_extended_keys && !(table_flags() & HA_CMP_REF_IS_EXPENSIVE)) + if (!m_using_extended_keys && !(table_flags() & HA_SLOW_CMP_REF)) cmp_func= cmp_key_rowid_part_id; else cmp_func= cmp_key_part_id; diff --git a/sql/handler.h b/sql/handler.h index f5603ad9dde..b98244fe47e 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -305,7 +305,8 @@ enum enum_alter_inplace_result { #define HA_CAN_MULTISTEP_MERGE (1LL << 53) /* calling cmp_ref() on the engine is expensive */ -#define HA_CMP_REF_IS_EXPENSIVE (1ULL << 54) +#define HA_SLOW_CMP_REF (1ULL << 54) +#define HA_CMP_REF_IS_EXPENSIVE HA_SLOW_CMP_REF /* bits in index_flags(index_number) for what you can do with index */ |