diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp index d615efae6..9a92e7687 100644 --- a/dbcon/mysql/ha_mcs.cpp +++ b/dbcon/mysql/ha_mcs.cpp @@ -381,7 +381,7 @@ int ha_mcs::end_bulk_insert() @see */ -int ha_mcs::update_row(const uchar* old_data, uchar* new_data) +int ha_mcs::update_row(const uchar* old_data, const uchar* new_data) { DBUG_ENTER("ha_mcs::update_row"); @@ -1034,8 +1034,8 @@ int ha_mcs::rename_table(const char* from, const char* to) @see check_quick_keys() in opt_range.cc */ -ha_rows ha_mcs::records_in_range(uint32_t inx, key_range* min_key, - key_range* max_key) +ha_rows ha_mcs::records_in_range(uint32_t inx, const key_range* min_key, + const key_range* max_key, page_range* res) { DBUG_ENTER("ha_mcs::records_in_range"); DBUG_RETURN(10); // low number to force index usage diff --git a/dbcon/mysql/ha_mcs.h b/dbcon/mysql/ha_mcs.h index e3e7a779c..3d7bdf297 100644 --- a/dbcon/mysql/ha_mcs.h +++ b/dbcon/mysql/ha_mcs.h @@ -177,7 +177,7 @@ public: We implement this in ha_example.cc. It's not an obligatory method; skip it and and MySQL will treat it as not implemented. */ - int update_row(const uchar* old_data, uchar* new_data); + int update_row(const uchar* old_data, const uchar* new_data) override; int direct_update_rows_init(List *update_fields); int direct_update_rows(ha_rows *update_rows); int direct_update_rows(ha_rows *update_rows, ha_rows *found_rows); @@ -239,8 +239,8 @@ public: int extra(enum ha_extra_function operation); int external_lock(THD* thd, int lock_type); ///< required int delete_all_rows(void); - ha_rows records_in_range(uint32_t inx, key_range* min_key, - key_range* max_key); + ha_rows records_in_range(uint32_t inx, const key_range* min_key, + const key_range* max_key, page_range* res) override; int delete_table(const char* from); int rename_table(const char* from, const char* to); int create(const char* name, TABLE* form,