Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-27 21:08:53 +01:00 · 2006-12-27 21:08:53 +01:00 · 249f799d61
commit 249f799d61
parent 7b9a5f6de2 d63fa8434c
1 changed files with 2 additions and 0 deletions
--- a/sql/table.cc
+++ b/sql/table.cc
@ -785,6 +785,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
  memcpy(comment_pos, disk_buff+read_length-com_length, com_length);

  fix_type_pointers(&interval_array, &share->fieldnames, 1, &names);
+  if (share->fieldnames.count != share->fields)
+    goto err;
  fix_type_pointers(&interval_array, share->intervals, interval_count,
 		    &names);