diff options
Diffstat (limited to 'storage/cassandra/ha_cassandra.cc')
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index b24c0adb0fb..3fbe1834f89 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -509,7 +509,7 @@ int ha_cassandra::create(const char *name, TABLE *table_arg, DBUG_ENTER("ha_cassandra::create"); if (table_arg->s->keys != 1 || table_arg->s->primary_key !=0 || - table_arg->key_info[0].key_parts != 1 || + table_arg->key_info[0].user_defined_key_parts != 1 || table_arg->key_info[0].key_part[0].fieldnr != 1) { my_error(ER_WRONG_COLUMN_NAME, MYF(0), @@ -2342,7 +2342,7 @@ int ha_cassandra::multi_range_read_explain_info(uint mrr_mode, char *str, size_t if (!(mrr_mode & HA_MRR_USE_DEFAULT_IMPL)) { uint mrr_str_len= strlen(mrr_str); - uint copy_len= min(mrr_str_len, size); + uint copy_len= MY_MIN(mrr_str_len, size); memcpy(str, mrr_str, size); return copy_len; } |