Skip to content

M
MariaDB
Commit 01d5d6db authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Fix GCC 6.3.0 warnings.

parent 6011fb6d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
storage/innobase/fsp/fsp0fsp.cc
View file @ 01d5d6db
...@@ -2801,6 +2801,7 @@ fsp_reserve_free_extents( ...@@ -2801,6 +2801,7 @@ fsp_reserve_free_extents(
} }
} else { } else {
ut_a(alloc_type == FSP_CLEANING); ut_a(alloc_type == FSP_CLEANING);
reserve = 0;
} }
success = fil_space_reserve_free_extents(space, n_free, n_ext); success = fil_space_reserve_free_extents(space, n_free, n_ext);
......
storage/innobase/row/row0ftsort.cc
View file @ 01d5d6db
...@@ -620,7 +620,6 @@ fts_parallel_tokenization( ...@@ -620,7 +620,6 @@ fts_parallel_tokenization(
mem_heap_t* blob_heap = NULL; mem_heap_t* blob_heap = NULL;
fts_doc_t doc; fts_doc_t doc;
dict_table_t* table = psort_info->psort_common->new_table; dict_table_t* table = psort_info->psort_common->new_table;
dict_field_t* idx_field;
fts_tokenize_ctx_t t_ctx; fts_tokenize_ctx_t t_ctx;
ulint retried = 0; ulint retried = 0;
dberr_t error = DB_SUCCESS; dberr_t error = DB_SUCCESS;
...@@ -642,9 +641,6 @@ fts_parallel_tokenization( ...@@ -642,9 +641,6 @@ fts_parallel_tokenization(
doc.charset = fts_index_get_charset( doc.charset = fts_index_get_charset(
psort_info->psort_common->dup->index); psort_info->psort_common->dup->index);
idx_field = dict_index_get_nth_field(
psort_info->psort_common->dup->index, 0);
block = psort_info->merge_block; block = psort_info->merge_block;
zip_size = dict_table_zip_size(table); zip_size = dict_table_zip_size(table);
......
storage/xtradb/fsp/fsp0fsp.cc
View file @ 01d5d6db
...@@ -2810,6 +2810,7 @@ fsp_reserve_free_extents( ...@@ -2810,6 +2810,7 @@ fsp_reserve_free_extents(
} }
} else { } else {
ut_a(alloc_type == FSP_CLEANING); ut_a(alloc_type == FSP_CLEANING);
reserve = 0;
} }
success = fil_space_reserve_free_extents(space, n_free, n_ext); success = fil_space_reserve_free_extents(space, n_free, n_ext);
......
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