fixup! 056c83cc

storage/innobase/handler/handler0alter.cc

@@ -10200,7 +10200,14 @@ commit_try_rebuild(
 	"parent" table. */
 	if (!user_table->space) {
 		rebuilt_table->file_unreadable = true;
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 12
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wconversion" /* GCC 5 to 11 need this */
+#endif
 		rebuilt_table->flags2 |= DICT_TF2_DISCARDED;
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ < 12
+# pragma GCC diagnostic pop /* ignored "-Wconversion" */
+#endif
 	}
 
 	/* We can now rename the old table as a temporary table,

storage/innobase/include/dict0mem.h

@@ -264,8 +264,8 @@ use its own tablespace instead of the system tablespace. */
 #define DICT_TF2_USE_FILE_PER_TABLE	16U
 
 /** Set when we discard/detach the tablespace */
-#define DICT_TF2_POS_DISCARDED  5
-#define DICT_TF2_DISCARDED  (1U << DICT_TF2_POS_DISCARDED)
+constexpr unsigned DICT_TF2_POS_DISCARDED= 5;
+constexpr unsigned DICT_TF2_DISCARDED= 1U << DICT_TF2_POS_DISCARDED;
 
 /** This bit is set if all aux table names (both common tables and
 index tables) of a FTS table are in HEX format. */