Commit 68de006d authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/table.cc:
  Auto merged
parents b7fe8902 ccf6d6b1

sql/table.cc

+2 −0
Original line number Diff line number Diff line
@@ -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);