Remove unused variables

storage/innobase/dict/dict0mem.cc

@@ -1593,7 +1593,6 @@ void dict_table_t::construct_dropped_columns(const byte* data)
 	unsigned j = 0;
 	for (unsigned i = 0; i < n_dropped_cols; i++) {
 		dict_col_t&	drop_col = dropped_cols[i];
-		bool		is_fixed = false;
 		drop_col.set_dropped();
 
 		while (j < num_non_pk_fields) {
@@ -1602,13 +1601,10 @@ void dict_table_t::construct_dropped_columns(const byte* data)
 			}
 		}
 
-		is_fixed = (std::find(fixed_dcols.begin(), fixed_dcols.end(),
-				      j) != fixed_dcols.end());
-		if (is_fixed) {
-			drop_col.mtype = DATA_FIXBINARY;
-		} else {
-			drop_col.mtype = DATA_BINARY;
-		}
+		drop_col.mtype = std::find(fixed_dcols.begin(),
+					   fixed_dcols.end(), j)
+			!= fixed_dcols.end()
+			? DATA_FIXBINARY : DATA_BINARY;
 	}
 }
 

storage/innobase/rem/rem0rec.cc

@@ -536,9 +536,9 @@ rec_offs_validate(
 		}
 	}
 	if (index) {
-		ulint max_n_fields;
 		ut_ad(ulint(index) == offsets[3]);
-		max_n_fields = ut_max(
+#if 0 /* FIXME: enable this for node pointers, not for the metadata rec */
+		ulint max_n_fields = ut_max(
 			dict_index_get_n_fields(index),
 			dict_index_get_n_unique_in_tree(index) + 1);
 		if (comp && rec) {
@@ -558,11 +558,10 @@ rec_offs_validate(
 				ut_error;
 			}
 		}
-		/* index->n_def == 0 for dummy indexes if !comp */
-		ut_ad(!comp || index->n_def);
-#if 0 /* FIXME: enable this for node pointers, not for the metadata rec */
 		ut_ad(!index->n_def || i <= max_n_fields);
 #endif
+		/* index->n_def == 0 for dummy indexes if !comp */
+		ut_ad(!comp || index->n_def);
 	}
 	while (i--) {
 		ulint	curr = rec_offs_base(offsets)[1 + i] & REC_OFFS_MASK;