diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 71cbc0be1e3..5749ff9c190 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1654,7 +1654,9 @@ mysql_rename_table(enum db_type base,
     }
   }
   delete file;
-  if (error)
+  if (error == HA_ERR_WRONG_COMMAND)
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "ALTER TABLE");
+  else if (error)
     my_error(ER_ERROR_ON_RENAME, MYF(0), from, to, error);
   DBUG_RETURN(error != 0);
 }