Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into dipika.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
commit
79d4ed082b
@ -1678,7 +1678,7 @@ frm_type_enum mysql_frm_type(THD *thd, char *path, enum legacy_db_type *dbt)
|
||||
|
||||
if ((file= my_open(path, O_RDONLY | O_SHARE, MYF(0))) < 0)
|
||||
DBUG_RETURN(FRMTYPE_ERROR);
|
||||
error= my_read(file, (uchar*) header, sizeof(header), MYF(MY_WME | MY_NABP));
|
||||
error= my_read(file, (uchar*) header, sizeof(header), MYF(MY_NABP));
|
||||
my_close(file, MYF(MY_WME));
|
||||
|
||||
if (error)
|
||||
|
Loading…
x
Reference in New Issue
Block a user