diff options
| -rw-r--r-- | sql/field.h | 2 | ||||
| -rw-r--r-- | sql/key.cc | 2 | ||||
| -rw-r--r-- | sql/key.h | 2 | ||||
| -rw-r--r-- | sql/table.h | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h index 49e82766af3..0925886ec2f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1239,7 +1239,7 @@ public: const Relay_log_info *rli, const Conv_param ¶m) const; - inline int cmp(const uchar *str) { return cmp(ptr,str); } + inline int cmp(const uchar *str) const { return cmp(ptr,str); } virtual int cmp_max(const uchar *a, const uchar *b, uint max_len) const { return cmp(a, b); } virtual int cmp(const uchar *,const uchar *) const=0; diff --git a/sql/key.cc b/sql/key.cc index 9dbb7a15726..5ec76d37d5b 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -112,7 +112,7 @@ int find_ref_key(KEY *key, uint key_count, uchar *record, Field *field, @param with_zerofill skipped bytes in the key buffer to be filled with 0 */ -void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info, +void key_copy(uchar *to_key, const uchar *from_record, const KEY *key_info, uint key_length, bool with_zerofill) { uint length; diff --git a/sql/key.h b/sql/key.h index 45f58c75655..871373bfcd5 100644 --- a/sql/key.h +++ b/sql/key.h @@ -25,7 +25,7 @@ typedef struct st_key_part_info KEY_PART_INFO; int find_ref_key(KEY *key, uint key_count, uchar *record, Field *field, uint *key_length, uint *keypart); -void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info, +void key_copy(uchar *to_key, const uchar *from_record, const KEY *key_info, uint key_length, bool with_zerofill= FALSE); void key_restore(uchar *to_record, const uchar *from_key, KEY *key_info, uint key_length); diff --git a/sql/table.h b/sql/table.h index fd7d23a13c8..4d18d6b1c77 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1775,7 +1775,7 @@ class IS_table_read_plan; constexpr uint frm_fieldno_size= 2; static inline uint16 read_frm_fieldno(const uchar *data) { return uint2korr(data); } -static inline void store_frm_fieldno(const uchar *data, uint16 fieldno) +static inline void store_frm_fieldno(uchar *data, uint16 fieldno) { int2store(data, fieldno); } class select_unit; diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index f1b4191486a..ab344e681fb 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -2170,7 +2170,7 @@ int ha_cassandra::info(uint flag) } -void key_copy(uchar *to_key, const uchar *from_record, KEY *key_info, +void key_copy(uchar *to_key, const uchar *from_record, const KEY *key_info, uint key_length, bool with_zerofill); |