diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index aaa59d04f03..ff0684a9ba4 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6264,12 +6264,14 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
         goto err;
       DEBUG_SYNC(thd,"alter_table_enable_indexes");
       error= table->file->ha_enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
+      table->s->allow_access_to_protected_table();
       break;
     case DISABLE:
       if (wait_while_table_is_used(thd, table, extra_func,
                                    TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE))
         goto err;
       error=table->file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
+      table->s->allow_access_to_protected_table();
       break;
     default:
       DBUG_ASSERT(FALSE);
@@ -6812,6 +6814,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
     error= trans_commit_stmt(thd);
     if (trans_commit_implicit(thd))
       error= 1;
+    table->s->allow_access_to_protected_table();
   }
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;
 
diff --git a/sql/table.h b/sql/table.h
index eaea0fe65e5..cfdc0ffd077 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -806,6 +806,15 @@ struct TABLE_SHARE
   {
     version= 0;
   }
+  /*
+    This is used only for the case of locked tables, as we want to
+    allow one to do SHOW commands on them even after ALTER or REPAIR
+  */
+  inline void allow_access_to_protected_table()
+  {
+    DBUG_ASSERT(version == 0);
+    version= 1;
+  }
   /*
     Remove from table definition cache at close.
     Table can still be opened by SHOW