Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines


sql/table.cc:
  Manual merge.

sql/table.cc

@@ -453,6 +453,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
   memcpy(comment_pos, disk_buff+read_length-com_length, com_length);
 
   fix_type_pointers(&int_array, &share->fieldnames, 1, &names);
+  if (share->fieldnames.count != share->fields)
+    goto err;
   fix_type_pointers(&int_array, share->intervals, interval_count,
 		    &names);