Add dict_table_t::not_redundant()

storage/innobase/handler/handler0alter.cc

@@ -150,6 +150,9 @@ inline void dict_table_t::prepare_instant(const dict_table_t& old,
 	DBUG_ASSERT(n_dropped() == 0);
 	DBUG_ASSERT(old.n_cols == old.n_def);
 	DBUG_ASSERT(n_cols == n_def);
+	DBUG_ASSERT(old.not_redundant() == not_redundant());
+	DBUG_ASSERT(old.supports_instant());
+	DBUG_ASSERT(supports_instant());
 
 	const dict_index_t& oindex = *old.indexes.start;
 	dict_index_t& index = *indexes.start;

storage/innobase/include/dict0dict.h

@@ -904,15 +904,8 @@ dict_index_get_min_size(
 /*====================*/
 	const dict_index_t*	index)	/*!< in: index */
 	MY_ATTRIBUTE((nonnull, warn_unused_result));
-/********************************************************************//**
-Check whether the table uses the compact page format.
-@return TRUE if table uses the compact page format */
-UNIV_INLINE
-bool
-dict_table_is_comp(
-/*===============*/
-	const dict_table_t*	table)	/*!< in: table */
-	MY_ATTRIBUTE((nonnull, warn_unused_result));
+
+#define dict_table_is_comp(table) (table)->not_redundant()
 
 /** Determine if a table uses atomic BLOBs (no locally stored prefix).
 @param[in]	table	InnoDB table

storage/innobase/include/dict0dict.ic

@@ -532,19 +532,6 @@ dict_table_get_sys_col_no(
 	return unsigned(table->n_cols) + (sys - DATA_N_SYS_COLS);
 }
 
-/********************************************************************//**
-Check whether the table uses the compact page format.
-@return TRUE if table uses the compact page format */
-UNIV_INLINE
-bool
-dict_table_is_comp(
-/*===============*/
-	const dict_table_t*	table)	/*!< in: table */
-{
-	ut_ad(table);
-	return (table->flags & DICT_TF_COMPACT) != 0;
-}
-
 /************************************************************************
 Check if the table has an FTS index. */
 UNIV_INLINE

storage/innobase/include/dict0mem.h

@@ -1558,6 +1558,9 @@ struct dict_table_t {
 		return flags2 & DICT_TF2_TEMPORARY;
 	}
 
+	/** @return whether the table is not in ROW_FORMAT=REDUNDANT */
+	bool not_redundant() const { return flags & DICT_TF_COMPACT; }
+
 	/** @return whether this table is readable
 	@retval	true	normally
 	@retval	false	if this is a single-table tablespace