Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into dipika.(none):/opt/local/work/mysql-5.1-runtime

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into dipika.(none):/opt/local/work/mysql-5.1-runtime
79d4ed08 · kostja@dipika.(none) · fd3bcbea · 1719d9a2 · 79d4ed08
Commit 79d4ed08 authored Feb 26, 2008 by kostja@dipika.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_view.cc sql/sql_view.cc +1 -1

No files found.
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -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)