Commit 15f2bcfa authored by Sergei Petrunia's avatar Sergei Petrunia

MariaRocks port: get rid of "invalid table name" in the error log

filename_to_tablename() in MariaDB produces warnings when its is
called for temporary file names.
Don't call this function for temporary filename (as we don't need
its result anyway)
parent 1d1211ab
...@@ -5089,9 +5089,7 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg, ...@@ -5089,9 +5089,7 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg,
DBUG_ENTER("ha_rocksdb::create_cfs"); DBUG_ENTER("ha_rocksdb::create_cfs");
char tablename_sys[NAME_LEN + 1]; char tablename_sys[NAME_LEN + 1];
bool tsys_set= false;
my_core::filename_to_tablename(tbl_def_arg->base_tablename().c_str(),
tablename_sys, sizeof(tablename_sys));
/* /*
The first loop checks the index parameters and creates The first loop checks the index parameters and creates
...@@ -5105,6 +5103,13 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg, ...@@ -5105,6 +5103,13 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg,
!is_hidden_pk(i, table_arg, tbl_def_arg) && !is_hidden_pk(i, table_arg, tbl_def_arg) &&
tbl_def_arg->base_tablename().find(tmp_file_prefix) != 0) tbl_def_arg->base_tablename().find(tmp_file_prefix) != 0)
{ {
if (!tsys_set)
{
tsys_set= true;
my_core::filename_to_tablename(tbl_def_arg->base_tablename().c_str(),
tablename_sys, sizeof(tablename_sys));
}
for (uint part= 0; part < table_arg->key_info[i].ext_key_parts; part++) for (uint part= 0; part < table_arg->key_info[i].ext_key_parts; part++)
{ {
if (!rdb_is_index_collation_supported( if (!rdb_is_index_collation_supported(
......
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