diff options
| -rw-r--r-- | sql/ha_partition.h | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 4 | ||||
| -rw-r--r-- | sql/handler.h | 6 | ||||
| -rw-r--r-- | sql/item_vers.cc | 2 | ||||
| -rw-r--r-- | sql/partition_info.h | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innopart.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innopart.h | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 861ba47b94e..98e0c1baafe 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -1360,7 +1360,7 @@ public: return m_innodb; } - virtual ha_rows part_recs_slow(void *_part_elem) + virtual ha_rows part_records(void *_part_elem) { partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem); DBUG_ASSERT(m_part_info); diff --git a/sql/handler.cc b/sql/handler.cc index f2e74d936fd..8ec9feab7c5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6674,7 +6674,7 @@ bool Vers_parse_info::check_and_fix_implicit( const char* table_name) { bool integer_fields= - create_info->db_type->flags & HTON_SUPPORTS_SYS_VERSIONING; + create_info->db_type->flags & HTON_NATIVE_SYS_VERSIONING; SELECT_LEX &slex= thd->lex->select_lex; int vers_tables= 0; @@ -6826,7 +6826,7 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info, TABLE_SHARE *share) { bool integer_fields= - create_info->db_type->flags & HTON_SUPPORTS_SYS_VERSIONING; + create_info->db_type->flags & HTON_NATIVE_SYS_VERSIONING; const char *table_name= share->table_name.str; if (!need_check() && !share->versioned) diff --git a/sql/handler.h b/sql/handler.h index 807ae234fef..6f65853256c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1442,7 +1442,7 @@ handlerton *ha_default_tmp_handlerton(THD *thd); */ #define HTON_NO_BINLOG_ROW_OPT (1 << 9) #define HTON_SUPPORTS_EXTENDED_KEYS (1 <<10) //supports extended keys -#define HTON_SUPPORTS_SYS_VERSIONING (1 << 11) //Engine supports System Versioning +#define HTON_NATIVE_SYS_VERSIONING (1 << 11) //Engine supports System Versioning // MySQL compatibility. Unused. #define HTON_SUPPORTS_FOREIGN_KEYS (1 << 0) //Foreign key constraint supported. @@ -4368,8 +4368,8 @@ public: { return -1; /*unsupported */} virtual bool versioned() const - { DBUG_ASSERT(ht); return partition_ht()->flags & HTON_SUPPORTS_SYS_VERSIONING; } - virtual ha_rows part_recs_slow(void *_part_elem) + { DBUG_ASSERT(ht); return partition_ht()->flags & HTON_NATIVE_SYS_VERSIONING; } + virtual ha_rows part_records(void *_part_elem) { DBUG_ASSERT(0); return false; } virtual handler* part_handler(uint32 part_id) { DBUG_ASSERT(0); return NULL; } diff --git a/sql/item_vers.cc b/sql/item_vers.cc index 81cc3808651..eff4c15db6b 100644 --- a/sql/item_vers.cc +++ b/sql/item_vers.cc @@ -71,7 +71,7 @@ VTQ_common<Item_func_X>::init_hton() hton= plugin_hton(plugin_int_to_ref(innodb_plugin)); DBUG_ASSERT(hton); } - if (hton && !(hton->flags & HTON_SUPPORTS_SYS_VERSIONING)) + if (hton && !(hton->flags & HTON_NATIVE_SYS_VERSIONING)) { my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), Item::name ? Item::name : this->func_name()); hton= NULL; diff --git a/sql/partition_info.h b/sql/partition_info.h index ef20564837c..9dff7a41a4a 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -476,7 +476,7 @@ public: part= vers_hist_part(); } // TODO: cache thread-shared part_recs and increment on INSERT - return table->file->part_recs_slow(part) >= vers_info->limit; + return table->file->part_records(part) >= vers_info->limit; } Vers_field_stats& vers_stat_trx(stat_trx_field fld, uint32 part_element_id) { diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5e3a3621185..d4b5b89ac30 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3859,7 +3859,7 @@ innobase_init( innobase_hton->flush_logs = innobase_flush_logs; innobase_hton->show_status = innobase_show_status; innobase_hton->flags = - HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS | HTON_SUPPORTS_SYS_VERSIONING; + HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS | HTON_NATIVE_SYS_VERSIONING; innobase_hton->release_temporary_latches = innobase_release_temporary_latches; diff --git a/storage/innobase/handler/ha_innopart.cc b/storage/innobase/handler/ha_innopart.cc index 35c77d1d5ec..76f17f995a4 100644 --- a/storage/innobase/handler/ha_innopart.cc +++ b/storage/innobase/handler/ha_innopart.cc @@ -3045,7 +3045,7 @@ ha_innopart::records() } ha_rows -ha_innopart::part_recs_slow(void *_part_elem) +ha_innopart::part_records(void *_part_elem) { partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem); DBUG_ASSERT(m_part_info); diff --git a/storage/innobase/handler/ha_innopart.h b/storage/innobase/handler/ha_innopart.h index ef66420acb1..090543196c4 100644 --- a/storage/innobase/handler/ha_innopart.h +++ b/storage/innobase/handler/ha_innopart.h @@ -1356,7 +1356,7 @@ public: } virtual ha_rows - part_recs_slow(void *_part_elem); + part_records(void *_part_elem); private: |