Commit ccf6d6b1 authored by unknown's avatar unknown
Browse files

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

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


sql/table.cc:
  Manual merge.
parents 901cbf03 1da6e6fe

sql/table.cc

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