diff options
| -rw-r--r-- | sql/item.h | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index d61667f3f2f..c11a4fe56c0 100644 --- a/sql/item.h +++ b/sql/item.h @@ -520,7 +520,7 @@ class Rewritable_query_parameter Value of 0 means that this object doesn't have to be replaced (for example SP variables in control statements) */ - uint pos_in_query; + my_ptrdiff_t pos_in_query; /* Byte length of parameter name in the statement. This is not 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, |