Merge 10.3 into 10.4

1 files changed, 3 insertions, 19 deletions

diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index 3ecfd7a096c..52639eee462 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -949,7 +949,6 @@ dict_index_get_nth_field_pos(
 	ulint			n_fields;
 	ulint			pos;
 
-	ut_ad(index);
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
 
 	field2 = dict_index_get_nth_field(index2, n);
@@ -1058,8 +1057,6 @@ dict_table_col_in_clustered_key(
 	ulint			pos;
 	ulint			n_fields;
 
-	ut_ad(table);
-
 	col = dict_table_get_nth_col(table, n);
 
 	index = dict_table_get_first_index(table);
@@ -1228,8 +1225,7 @@ dict_table_add_system_columns(
 	dict_table_t*	table,	/*!< in/out: table */
 	mem_heap_t*	heap)	/*!< in: temporary heap */
 {
-	ut_ad(table);
-	ut_ad(table->n_def == (table->n_cols - DATA_N_SYS_COLS));
+	ut_ad(table->n_def == table->n_cols - DATA_N_SYS_COLS);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
 	ut_ad(!table->cached);
 
@@ -1951,7 +1947,6 @@ dict_table_change_id_in_cache(
 	dict_table_t*	table,	/*!< in/out: table object already in cache */
 	table_id_t	new_id)	/*!< in: new id to set */
 {
-	ut_ad(table);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
 	ut_ad(!table->is_temporary());
@@ -1976,7 +1971,6 @@ void dict_table_remove_from_cache(dict_table_t* table, bool lru, bool keep)
 	dict_foreign_t*	foreign;
 	dict_index_t*	index;
 
-	ut_ad(table);
 	ut_ad(dict_lru_validate());
 	ut_a(table->get_ref_count() == 0);
 	ut_a(table->n_rec_locks == 0);
@@ -2324,7 +2318,6 @@ dict_index_add_to_cache(
 	ulint		n_ord;
 	ulint		i;
 
-	ut_ad(index);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(index->n_def == index->n_fields);
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
@@ -2963,7 +2956,6 @@ dict_index_build_internal_clust(
 	/* Add to new_index non-system columns of table not yet included
 	there */
 	for (i = 0; i + DATA_N_SYS_COLS < ulint(table->n_cols); i++) {
-
 		dict_col_t*	col = dict_table_get_nth_col(table, i);
 		ut_ad(col->mtype != DATA_SYS);
 
@@ -5187,7 +5179,6 @@ dict_foreign_parse_drop_constraints(
 	const char*		id;
 	CHARSET_INFO*		cs;
 
-	ut_a(trx);
 	ut_a(trx->mysql_thd);
 
 	cs = innobase_get_charset(trx->mysql_thd);
@@ -5353,9 +5344,8 @@ dict_index_check_search_tuple(
 	const dict_index_t*	index,	/*!< in: index tree */
 	const dtuple_t*		tuple)	/*!< in: tuple used in a search */
 {
-	ut_a(index);
-	ut_a(dtuple_get_n_fields_cmp(tuple)
-	     <= dict_index_get_n_unique_in_tree(index));
+	ut_ad(dtuple_get_n_fields_cmp(tuple)
+	      <= dict_index_get_n_unique_in_tree(index));
 	return(TRUE);
 }
 #endif /* UNIV_DEBUG */
@@ -6852,8 +6842,6 @@ dict_index_zip_success(
 /*===================*/
 	dict_index_t*	index)	/*!< in/out: index to be updated. */
 {
-	ut_ad(index);
-
 	ulint zip_threshold = zip_failure_threshold_pct;
 	if (!zip_threshold) {
 		/* Disabled by user. */
@@ -6874,8 +6862,6 @@ dict_index_zip_failure(
 /*===================*/
 	dict_index_t*	index)	/*!< in/out: index to be updated. */
 {
-	ut_ad(index);
-
 	ulint zip_threshold = zip_failure_threshold_pct;
 	if (!zip_threshold) {
 		/* Disabled by user. */
@@ -6901,8 +6887,6 @@ dict_index_zip_pad_optimal_page_size(
 	ulint	min_sz;
 	ulint	sz;
 
-	ut_ad(index);
-
 	if (!zip_failure_threshold_pct) {
 		/* Disabled by user. */
 		return(srv_page_size);