diff --git a/storage/rocksdb/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index f5f1e8c4ca25..275fff3a5d06 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -1689,16 +1689,18 @@ static ST_FIELD_INFO rdb_i_s_sst_props_fields_info[] = { MYSQL_TYPE_LONGLONG, 0), ROCKSDB_FIELD_INFO("FILTER_BLOCK_SIZE", sizeof(int64_t), MYSQL_TYPE_LONGLONG, 0), - ROCKSDB_FIELD_INFO("COMPRESSION_ALGO", NAME_LEN + 1, MYSQL_TYPE_STRING, 0), + ROCKSDB_FIELD_INFO("COMPRESSION_ALGO", NAME_LEN + 1, MYSQL_TYPE_STRING, + MY_I_S_MAYBE_NULL), ROCKSDB_FIELD_INFO("CREATION_TIME", sizeof(int64_t), MYSQL_TYPE_LONGLONG, 0), ROCKSDB_FIELD_INFO("FILE_CREATION_TIME", sizeof(int64_t), MYSQL_TYPE_LONGLONG, 0), ROCKSDB_FIELD_INFO("OLDEST_KEY_TIME", sizeof(int64_t), MYSQL_TYPE_LONGLONG, 0), - ROCKSDB_FIELD_INFO("FILTER_POLICY", NAME_LEN + 1, MYSQL_TYPE_STRING, 0), + ROCKSDB_FIELD_INFO("FILTER_POLICY", NAME_LEN + 1, MYSQL_TYPE_STRING, + MY_I_S_MAYBE_NULL), ROCKSDB_FIELD_INFO("COMPRESSION_OPTIONS", NAME_LEN + 1, MYSQL_TYPE_STRING, - 0), + MY_I_S_MAYBE_NULL), ROCKSDB_FIELD_INFO_END}; static int rdb_i_s_sst_props_fill_table( @@ -1767,6 +1769,7 @@ static int rdb_i_s_sst_props_fill_table( if (props.second->compression_name.empty()) { field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->set_null(); } else { + field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->set_notnull(); field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->store( props.second->compression_name.c_str(), props.second->compression_name.size(), system_charset_info); @@ -1780,6 +1783,7 @@ static int rdb_i_s_sst_props_fill_table( if (props.second->filter_policy_name.empty()) { field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->set_null(); } else { + field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->set_notnull(); field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->store( props.second->filter_policy_name.c_str(), props.second->filter_policy_name.size(), system_charset_info); @@ -1787,6 +1791,7 @@ static int rdb_i_s_sst_props_fill_table( if (props.second->compression_options.empty()) { field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->set_null(); } else { + field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->set_notnull(); field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->store( props.second->compression_options.c_str(), props.second->compression_options.size(), system_charset_info);