bzr commit into mysql-5.1-bugteam branch (staale.smedseng:2830) Bug#29458

[Staale Smedseng]

#At file:///export/home/tmp/ss156133/z/a51/ based on revid:bernt.johnsen@stripped

 2830 Staale Smedseng	2009-03-05
      Addendum to previous patch for Bug#29458. A number 
      of system errnos when opening a table are masked 
      as ER_FILE_NOT_FOUND. This patch handles this as
      "Operation failed" as well.

    modified:
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2009-02-27 15:06:23 +0000
+++ b/sql/sql_table.cc	2009-03-05 08:41:00 +0000
@@ -4298,7 +4298,8 @@ static bool mysql_admin_table(THD* thd, 
         push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
                      ER_VIEW_CHECKSUM, ER(ER_VIEW_CHECKSUM));
       if (thd->main_da.is_error() && 
-          thd->main_da.sql_errno() == ER_NO_SUCH_TABLE)
+          (thd->main_da.sql_errno() == ER_NO_SUCH_TABLE ||
+           thd->main_da.sql_errno() == ER_FILE_NOT_FOUND))
         /* A missing table is just issued as a failed command */
         result_code= HA_ADMIN_FAILED;
       else


Attachment: [text/bzr-bundle] bzr/[e-mail]