Merge host.loc:/work/bugs/5.0-bugteam-36055

into  host.loc:/work/bk/5.0-bugteam

2 files changed, 9 insertions, 0 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index bfad10f986f..40b85a0901c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1980,6 +1980,8 @@ int handler::ha_check_for_upgrade(HA_CHECK_OPT *check_opt)
       }
     }
   }
+  if (table->s->frm_version != FRM_VER_TRUE_VARCHAR)
+    return HA_ADMIN_NEEDS_ALTER;
   return check_for_upgrade(check_opt);
 }
 
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9e1a8151e3a..f1de63892d5 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2118,6 +2118,13 @@ static int prepare_for_repair(THD* thd, TABLE_LIST *table_list,
   const char **ext= table->file->bas_ext();
   MY_STAT stat_info;
 
+  if (table->s->frm_version != FRM_VER_TRUE_VARCHAR)
+  {
+    error= send_check_errmsg(thd, table_list, "repair",
+                             "Failed reparing incompatible .FRM file");
+    goto end;
+  }
+
   /*
     Check if this is a table type that stores index and data separately,
     like ISAM or MyISAM. We assume fixed order of engine file name