diff options
| author | kostja@dipika.(none) <> | 2008-02-26 16:22:42 +0300 |
|---|---|---|
| committer | kostja@dipika.(none) <> | 2008-02-26 16:22:42 +0300 |
| commit | 79d4ed082b142ea7a693ce1d536dddb2b2dc5ee0 (patch) | |
| tree | 158baf4eb97f70063846fa97e3710eb43c4cf1e0 | |
| parent | fd3bcbea80fa34c5c69e602958799dcb10ba8cd0 (diff) | |
| parent | 1719d9a2cd1e2f7c96c6aefedc1a4f795714bf3e (diff) | |
| download | mariadb-git-79d4ed082b142ea7a693ce1d536dddb2b2dc5ee0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into dipika.(none):/opt/local/work/mysql-5.1-runtime
| -rw-r--r-- | sql/sql_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 1cf1a22bb90..a654721de37 100644 --- 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) |