diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc

index 0434b891ffc..dfd622e0206 100644

--- a/sql/ha_partition.cc

+++ b/sql/ha_partition.cc

@@ -10099,7 +10099,8 @@ ha_partition::check_if_supported_inplace_alter(TABLE *altered_table,

                                                Alter_inplace_info *ha_alter_info)

 {

   uint index= 0;

-  enum_alter_inplace_result result= HA_ALTER_INPLACE_NO_LOCK;

+  enum_alter_inplace_result result;

+  alter_table_operations orig_ops;

   ha_partition_inplace_ctx *part_inplace_ctx;

   bool first_is_set= false;

   THD *thd= ha_thd();

@@ -10126,6 +10127,10 @@ ha_partition::check_if_supported_inplace_alter(TABLE *altered_table,

   if (!part_inplace_ctx->handler_ctx_array)

     DBUG_RETURN(HA_ALTER_ERROR);

+  do {

+    orig_ops= ha_alter_info->handler_flags;

+    result= HA_ALTER_INPLACE_NO_LOCK;

+

   /* Set all to NULL, including the terminating one. */

   for (index= 0; index <= m_tot_parts; index++)

     part_inplace_ctx->handler_ctx_array[index]= NULL;

@@ -10154,6 +10159,8 @@ ha_partition::check_if_supported_inplace_alter(TABLE *altered_table,

       break;

   }

+  } while (orig_ops != ha_alter_info->handler_flags);

+

   ha_alter_info->handler_ctx= part_inplace_ctx;

   /*

     To indicate for future inplace calls that there are several