revision-id: 01d5d6db4c337daae0aa593341e081cc6bfebb8a (mariadb-10.0.29-25- g01d5d6db4c3)
parent(s): 6011fb6daa5ac9e6cb97a23b877e4d2568c85d94
author: Marko Mäkelä
committer: Marko Mäkelä
timestamp: 2017-02-16 11:16:27 +0200
message:
Fix GCC 6.3.0 warnings.
---
storage/innobase/fsp/fsp0fsp.cc | 1 +
storage/innobase/row/row0ftsort.cc | 4 ----
storage/xtradb/fsp/fsp0fsp.cc | 1 +
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/ fsp0fsp.cc
index afdd6667711..836ed2de27a 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -2801,6 +2801,7 @@ fsp_reserve_free_extents(
}
} else {
ut_a(alloc_type == FSP_CLEANING);
+ reserve = 0;
}
success = fil_space_reserve_free_extents(space, n_free, n_ext);
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/ row0ftsort.cc
index f662ef6b461..4865c8e850a 100644
--- a/storage/innobase/row/row0ftsort.cc
+++ b/storage/innobase/row/row0ftsort.cc
@@ -620,7 +620,6 @@ fts_parallel_tokenization(
mem_heap_t* blob_heap = NULL;
fts_doc_t doc;
dict_table_t* table = psort_info->psort_common->new_table;
- dict_field_t* idx_field;
fts_tokenize_ctx_t t_ctx;
ulint retried = 0;
dberr_t error = DB_SUCCESS;
@@ -642,9 +641,6 @@ fts_parallel_tokenization(
doc.charset = fts_index_get_charset(
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;
zip_size = dict_table_zip_size(table);
diff --git a/storage/xtradb/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp. cc
index 0bdb2ea0d4c..64576c93545 100644
--- a/storage/xtradb/fsp/fsp0fsp.cc
+++ b/storage/xtradb/fsp/fsp0fsp.cc
@@ -2810,6 +2810,7 @@ fsp_reserve_free_extents(
}
} else {
ut_a(alloc_type == FSP_CLEANING);
+ reserve = 0;
}
success = fil_space_reserve_free_extents(space, n_free, n_ext);
_______________________________________________
commits mailing list
commits@mariadb.org
https://lists.askmonty.org/cgi-bin/mailman/listinfo/ commits