Remove unused variables from non-debug build

extra/mariabackup/xtrabackup.cc

@@ -3285,7 +3285,7 @@ static dberr_t xb_assign_undo_space_start()
 	byte*		page;
 	bool		ret;
 	dberr_t		error = DB_SUCCESS;
-	ulint		space, page_no;
+	ulint		space;
 	int n_retries = 5;
 
 	if (srv_undo_tablespaces == 0) {
@@ -3326,10 +3326,10 @@ static dberr_t xb_assign_undo_space_start()
 	/* 0th slot always points to system tablespace.
 	1st slot should point to first undotablespace which is minimum. */
 
-	page_no = mach_read_ulint(TRX_SYS + TRX_SYS_RSEGS
-				  + TRX_SYS_RSEG_SLOT_SIZE
-				  + TRX_SYS_RSEG_PAGE_NO + page, MLOG_4BYTES);
-	ut_ad(page_no != FIL_NULL);
+	ut_ad(mach_read_from_4(TRX_SYS + TRX_SYS_RSEGS
+			       + TRX_SYS_RSEG_SLOT_SIZE
+			       + TRX_SYS_RSEG_PAGE_NO + page)
+	      != FIL_NULL);
 
 	space = mach_read_ulint(TRX_SYS + TRX_SYS_RSEGS
 				+ TRX_SYS_RSEG_SLOT_SIZE

storage/innobase/handler/ha_innodb.cc

@@ -7937,7 +7937,6 @@ ha_innobase::build_template(
 		/* Include the fields that are not needed in index condition
 		pushdown. */
 		for (ulint i = 0; i < n_fields; i++) {
-			mysql_row_templ_t*	templ;
 			const Field*		field = table->field[i];
 			const bool is_v = !field->stored_in_db();
 			if (is_v && skip_virtual) {
@@ -7968,7 +7967,8 @@ ha_innobase::build_template(
 					}
 				}
 
-				templ = build_template_field(
+				ut_d(mysql_row_templ_t*	templ =)
+				build_template_field(
 					m_prebuilt, clust_index, index,
 					table, field, i - num_v, num_v);
 				ut_ad(templ->is_virtual == (ulint)is_v);
@@ -7982,7 +7982,6 @@ ha_innobase::build_template(
 		m_prebuilt->idx_cond = this;
 	} else {
 no_icp:
-		mysql_row_templ_t*	templ;
 		/* No index condition pushdown */
 		m_prebuilt->idx_cond = NULL;
 		ut_ad(num_v == 0);
@@ -8042,7 +8041,8 @@ ha_innobase::build_template(
 				}
 			}
 
-			templ = build_template_field(
+			ut_d(mysql_row_templ_t* templ =)
+			build_template_field(
 				m_prebuilt, clust_index, index,
 				table, field, i - num_v, num_v);
 			ut_ad(templ->is_virtual == (ulint)is_v);