Merge 10.4 into 10.5

1 files changed, 2 insertions, 17 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 85600d02b63..a5b3a9c0af5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4607,32 +4607,17 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
   DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
               m_lock_type != F_UNLCK);
 
-  const ulong v= table->s->mysql_version;
-
-  if ((v >= MYSQL_VERSION_ID) &&
+  if ((table->s->mysql_version >= MYSQL_VERSION_ID) &&
       (check_opt->sql_flags & TT_FOR_UPGRADE))
     return 0;
 
-  if (v < MYSQL_VERSION_ID)
+  if (table->s->mysql_version < MYSQL_VERSION_ID)
   {
     if (unlikely((error= check_old_types())))
       return error;
     error= ha_check_for_upgrade(check_opt);
     if (unlikely(error && (error != HA_ADMIN_NEEDS_CHECK)))
       return error;
-    if (table->s->table_category == TABLE_CATEGORY_USER &&
-        (v < 100142 ||
-         (v >= 100200 && v < 100228) ||
-         (v >= 100300 && v < 100319) ||
-         (v >= 100400 && v < 100409)))
-    {
-      for (const KEY *key= table->key_info,
-           *end= table->key_info + table->s->keys; key < end; key++)
-      {
-        if (key->flags & HA_BINARY_PACK_KEY && key->flags & HA_VAR_LENGTH_KEY)
-          return HA_ADMIN_NEEDS_UPGRADE;
-      }
-    }
     if (unlikely(!error && (check_opt->sql_flags & TT_FOR_UPGRADE)))
       return 0;
   }