Fix GCC 6.3.0 warnings.

dr-m · dr-m · commit 01d5d6db4c33 · 2017-02-16T11:16:27.000+02:00
diff --git 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2801,6 +2801,7 @@ fsp_reserve_free_extents(`
`2801`	`2801`	`}`
`2802`	`2802`	`} else {`
`2803`	`2803`	`ut_a(alloc_type == FSP_CLEANING);`
	`2804`	`+ reserve = 0;`
`2804`	`2805`	`}`
`2805`	`2806`
`2806`	`2807`	`success = fil_space_reserve_free_extents(space, n_free, n_ext);`
Original file line number	Diff line number	Diff line change
`@@ -2810,6 +2810,7 @@ fsp_reserve_free_extents(`
`2810`	`2810`	`}`
`2811`	`2811`	`} else {`
`2812`	`2812`	`ut_a(alloc_type == FSP_CLEANING);`
	`2813`	`+ reserve = 0;`
`2813`	`2814`	`}`
`2814`	`2815`
`2815`	`2816`	`success = fil_space_reserve_free_extents(space, n_free, n_ext);`