instant_alter_column_possible(): Correct a condition

1d75a6d4 · Marko Mäkelä · 2afb55b2 · 1d75a6d4
Commit 1d75a6d4 authored Sep 19, 2018 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +4 -6

No files found.
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -682,12 +682,10 @@ instant_alter_column_possible(
 		return false;
 	}
-	if (ha_alter_info->handler_flags
+	if (!(ha_alter_info->handler_flags
-	    & ~(ALTER_ADD_STORED_BASE_COLUMN
+	      & (ALTER_ADD_STORED_BASE_COLUMN
 		 | ALTER_DROP_STORED_COLUMN
-		| INNOBASE_ALTER_INSTANT
+		 | ALTER_STORED_COLUMN_ORDER))) {
-		| INNOBASE_INPLACE_IGNORE
-		| ALTER_STORED_COLUMN_ORDER)) {
 		return false;
 	}