bk commit into 5.1 tree (kostja:1.2580)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-26 16:19:23+03:00, kostja@dipika.(none) +1 -0
  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@stripped, 2008-02-26 16:19:21+03:00, kostja@dipika.(none) +1 -1
    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.

diff -Nrup a/sql/sql_view.cc b/sql/sql_view.cc
--- a/sql/sql_view.cc	2008-02-22 17:45:06 +03:00
+++ b/sql/sql_view.cc	2008-02-26 16:19:21 +03:00
@@ -1678,7 +1678,7 @@ frm_type_enum mysql_frm_type(THD *thd, c
 
   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)