database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

cleanup: rename a flag, keep old name for compatibility

Browse Source
This commit is contained in:
Sergei Golubchik
2018-11-16 18:24:22 +01:00
parent 649465db41
commit 1823ce7304
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_partition.cc
View File

@@ -5281,7 +5281,7 @@ bool ha_partition::init_record_priority_queue()
/* Initialize priority queue, initialized to reading forward. */ /* Initialize priority queue, initialized to reading forward. */
int (*cmp_func)(void *, uchar *, uchar *); int (*cmp_func)(void *, uchar *, uchar *);
void *cmp_arg= (void*) this; 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; cmp_func= cmp_key_rowid_part_id;
else else
cmp_func= cmp_key_part_id; cmp_func= cmp_key_part_id;

3
sql/handler.h
View File

@@ -305,7 +305,8 @@ enum enum_alter_inplace_result {
#define HA_CAN_MULTISTEP_MERGE (1LL << 53) #define HA_CAN_MULTISTEP_MERGE (1LL << 53)
/* calling cmp_ref() on the engine is expensive */ /* 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 */ /* bits in index_flags(index_number) for what you can do with index */

4
storage/spider/ha_spider.cc
View File

@@ -9392,8 +9392,8 @@ ulonglong ha_spider::table_flags() const
HA_BINLOG_ROW_CAPABLE | HA_BINLOG_ROW_CAPABLE |
HA_BINLOG_STMT_CAPABLE | HA_BINLOG_STMT_CAPABLE |
HA_PARTIAL_COLUMN_READ | HA_PARTIAL_COLUMN_READ |
#ifdef HA_CMP_REF_IS_EXPENSIVE #ifdef HA_SLOW_CMP_REF
HA_CMP_REF_IS_EXPENSIVE | HA_SLOW_CMP_REF |
#endif #endif
#ifdef SPIDER_ENGINE_CONDITION_PUSHDOWN_IS_ALWAYS_ON #ifdef SPIDER_ENGINE_CONDITION_PUSHDOWN_IS_ALWAYS_ON
HA_CAN_TABLE_CONDITION_PUSHDOWN | HA_CAN_TABLE_CONDITION_PUSHDOWN |