Skip to content

M
mariadb
Commit 40d62823 authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

Fix compile warnings

parent 3f8eaf7e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
storage/cassandra/ha_cassandra.cc
View file @ 40d62823
...@@ -160,8 +160,8 @@ cassandra_default_thrift_host_update(THD *thd, ...@@ -160,8 +160,8 @@ cassandra_default_thrift_host_update(THD *thd,
if (new_host) if (new_host)
{ {
strncpy(cassandra_default_host_buf, new_host, max_len); strncpy(cassandra_default_host_buf, new_host, max_len-1);
cassandra_default_host_buf[max_len]= 0; cassandra_default_host_buf[max_len-1]= 0;
cassandra_default_thrift_host= cassandra_default_host_buf; cassandra_default_thrift_host= cassandra_default_host_buf;
} }
else else
...@@ -539,10 +539,8 @@ int ha_cassandra::check_table_options(ha_table_option_struct *options) ...@@ -539,10 +539,8 @@ int ha_cassandra::check_table_options(ha_table_option_struct *options)
int ha_cassandra::create(const char *name, TABLE *table_arg, int ha_cassandra::create(const char *name, TABLE *table_arg,
HA_CREATE_INFO *create_info) HA_CREATE_INFO *create_info)
{ {
ha_table_option_struct *options= table_arg->s->option_struct;
int res; int res;
DBUG_ENTER("ha_cassandra::create"); DBUG_ENTER("ha_cassandra::create");
DBUG_ASSERT(options);
Field **pfield= table_arg->s->field; Field **pfield= table_arg->s->field;
if (!((*pfield)->flags & NOT_NULL_FLAG)) if (!((*pfield)->flags & NOT_NULL_FLAG))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7