diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:42:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:42:01 +0100 |
| commit | ed661a0e59c0a41cee2ee44fc219febdf49de10e (patch) | |
| tree | 6411ee52767a2c9a7a533c253e3ec51dbee5c797 /storage/cassandra | |
| parent | 4e1d3f83b79cd5f3a920937b462e585fdfb5a35d (diff) | |
| download | mariadb-git-ed661a0e59c0a41cee2ee44fc219febdf49de10e.tar.gz | |
post-merge: -Werror fixes in 10.3
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index c55e9976ede..0104fc06420 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -2360,7 +2360,7 @@ public: }; -int ha_cassandra::update_row(const uchar *old_data, uchar *new_data) +int ha_cassandra::update_row(const uchar *old_data, const uchar *new_data) { DYNAMIC_COLUMN_VALUE *oldvals, *vals; LEX_STRING *oldnames, *names; diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h index 5da1bbcaa78..49fd87ad15c 100644 --- a/storage/cassandra/ha_cassandra.h +++ b/storage/cassandra/ha_cassandra.h @@ -240,7 +240,7 @@ public: int close(void); int write_row(uchar *buf); - int update_row(const uchar *old_data, uchar *new_data); + int update_row(const uchar *old_data, const uchar *new_data); int delete_row(const uchar *buf); /** @brief @@ -268,7 +268,7 @@ public: THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); ///< required - my_bool register_query_cache_table(THD *thd, char *table_key, + my_bool register_query_cache_table(THD *thd, const char *table_key, uint key_length, qc_engine_callback *engine_callback, |