Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into chilla.local:/home/mydev/mysql-5.1-axmrg
This commit is contained in:
commit
249f799d61
@ -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);
|
memcpy(comment_pos, disk_buff+read_length-com_length, com_length);
|
||||||
|
|
||||||
fix_type_pointers(&interval_array, &share->fieldnames, 1, &names);
|
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,
|
fix_type_pointers(&interval_array, share->intervals, interval_count,
|
||||||
&names);
|
&names);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user