bk commit into 5.0 tree (ramil:1.1788) BUG#7205

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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
  1.1788 05/03/09 18:33:01 ramil@stripped +1 -0
  a fix (bug #7205: "archive" test fails on UnixWare when using prepared statements)

  sql/handler.cc
    1.144 05/03/09 18:32:55 ramil@stripped +4 -11
    s/MY_WME/0/ - don't issue an error when a file does not exists on
    deletion, a table does not need to have all bas_ext[] files;
    two-line function removed and expanded inline.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/5.0

--- 1.143/sql/handler.cc	2005-03-02 20:04:23 +04:00
+++ 1.144/sql/handler.cc	2005-03-09 18:32:55 +04:00
@@ -55,8 +55,6 @@
 
 	/* static functions defined in this file */
 
-static int NEAR_F delete_file(const char *name,const char *ext,int extflag);
-
 static SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
 
 /* list of all available storage engines (of their handlertons) */
@@ -1585,17 +1583,19 @@
   RETURN
     0   If we successfully deleted at least one file from base_ext and
 	didn't get any other errors than ENOENT    
-    #   Error from delete_file()
+    #   Error
 */
 
 int handler::delete_table(const char *name)
 {
   int error= 0;
   int enoent_or_zero= ENOENT;                   // Error if no file was deleted
+  char buff[FN_REFLEN];
 
   for (const char **ext=bas_ext(); *ext ; ext++)
   {
-    if (delete_file(name,*ext,2))
+    fn_format(buff, name, "", *ext, 2 | 4);
+    if (my_delete_with_symlink(buff, MYF(0)))
     {
       if ((error= my_errno) != ENOENT)
 	break;
@@ -1764,13 +1764,6 @@
 err_end:
   my_free((char*) frmblob, MYF(MY_ALLOW_ZERO_PTR));
   DBUG_RETURN(error);  
-}
-
-static int NEAR_F delete_file(const char *name,const char *ext,int extflag)
-{
-  char buff[FN_REFLEN];
-  VOID(fn_format(buff,name,"",ext,extflag | 4));
-  return(my_delete_with_symlink(buff,MYF(MY_WME)));
 }
 
 void st_ha_check_opt::init()