Merge 10.5 into 10.6

dr-m · dr-m · commit b930a1900e3c · 2021-03-08T11:40:21.000+02:00
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
@@ -4536,7 +4536,7 @@ row_rename_table_for_mysql(
 
 	if (table != NULL) {
 		if (commit && !table->is_temporary()) {
-			table->stats_bg_flag &= ~BG_STAT_SHOULD_QUIT;
+			table->stats_bg_flag &= byte(~BG_STAT_SHOULD_QUIT);
 		}
 		dict_table_close(table, dict_locked, FALSE);
 	}

Original file line number	Diff line number	Diff line change
`@@ -4536,7 +4536,7 @@ row_rename_table_for_mysql(`
`4536`	`4536`
`4537`	`4537`	`if (table != NULL) {`
`4538`	`4538`	`if (commit && !table->is_temporary()) {`
`4539`		`- table->stats_bg_flag &= ~BG_STAT_SHOULD_QUIT;`
	`4539`	`+ table->stats_bg_flag &= byte(~BG_STAT_SHOULD_QUIT);`
`4540`	`4540`	`}`
`4541`	`4541`	`dict_table_close(table, dict_locked, FALSE);`
`4542`	`4542`	`}`