database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix method declarations to match the base class (-Woverloaded-virtual)

Browse Source
This commit is contained in:
Alexey Antipovsky
2020-11-11 05:27:48 +00:00
parent e1f6f9f078
commit 83d3adf466
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_mcs.cpp
View File

@ -381,7 +381,7 @@ int ha_mcs::end_bulk_insert()
@see @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"); DBUG_ENTER("ha_mcs::update_row");
@ -1034,8 +1034,8 @@ int ha_mcs::rename_table(const char* from, const char* to)
@see @see
check_quick_keys() in opt_range.cc check_quick_keys() in opt_range.cc
*/ */
ha_rows ha_mcs::records_in_range(uint32_t inx, key_range* min_key, ha_rows ha_mcs::records_in_range(uint32_t inx, const key_range* min_key,
key_range* max_key) const key_range* max_key, page_range* res)
{ {
DBUG_ENTER("ha_mcs::records_in_range"); DBUG_ENTER("ha_mcs::records_in_range");
DBUG_RETURN(10); // low number to force index usage DBUG_RETURN(10); // low number to force index usage

6
dbcon/mysql/ha_mcs.h
View File

@ -177,7 +177,7 @@ public:
We implement this in ha_example.cc. It's not an obligatory method; We implement this in ha_example.cc. It's not an obligatory method;
skip it and and MySQL will treat it as not implemented. 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<Item> *update_fields); int direct_update_rows_init(List<Item> *update_fields);
int direct_update_rows(ha_rows *update_rows); int direct_update_rows(ha_rows *update_rows);
int direct_update_rows(ha_rows *update_rows, ha_rows *found_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 extra(enum ha_extra_function operation);
int external_lock(THD* thd, int lock_type); ///< required int external_lock(THD* thd, int lock_type); ///< required
int delete_all_rows(void); int delete_all_rows(void);
ha_rows records_in_range(uint32_t inx, key_range* min_key, ha_rows records_in_range(uint32_t inx, const key_range* min_key,
key_range* max_key); const key_range* max_key, page_range* res) override;
int delete_table(const char* from); int delete_table(const char* from);
int rename_table(const char* from, const char* to); int rename_table(const char* from, const char* to);
int create(const char* name, TABLE* form, int create(const char* name, TABLE* form,