From 226e6821396b35996594be3417e4c6e73c9a9c49 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Feb 2008 16:19:23 +0300 Subject: [PATCH] We never check the return value of mysql_frm_type for an error. Do not try to push an error into the error stack as it will be ignored anyway. --- sql/sql_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)