Commit 79a1be4a authored by unknown's avatar unknown
Browse files

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

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


sql/table.cc:
  Auto merged
parents 5d68cff0 1da6e6fe

sql/table.cc

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