Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
This commit is contained in:
svoj@mysql.com/june.mysql.com 2006-12-27 15:35:26 +04:00
commit 28b1bb363b

View File

@ -373,6 +373,8 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
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(&int_array,&outparam->fieldnames,1,&names); fix_type_pointers(&int_array,&outparam->fieldnames,1,&names);
if (outparam->fieldnames.count != outparam->fields)
goto err_not_open;
fix_type_pointers(&int_array,outparam->intervals,interval_count, fix_type_pointers(&int_array,outparam->intervals,interval_count,
&names); &names);