Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines

into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-27 19:24:08 +01:00 · 2006-12-27 19:24:08 +01:00 · 3765d8a012
commit 3765d8a012
parent 82b03f29ac c72d93b0ed
1 changed files with 2 additions and 0 deletions
--- a/sql/table.cc
+++ b/sql/table.cc
@ -452,6 +452,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);