bk commit into 5.0 tree (msvensson:1.1907)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1907 05/04/28 10:58:24 msvensson@neptunus.(none) +3 -0
  Merge

  sql/handler.cc
    1.165 05/04/28 10:58:23 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/examples/ha_archive.h
    1.18 05/04/28 10:58:23 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/examples/ha_archive.cc
    1.37 05/04/28 10:58:23 msvensson@neptunus.(none) +0 -0
    SCCS merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.164/sql/handler.cc	2005-04-27 13:25:25 +02:00
+++ 1.165/sql/handler.cc	2005-04-28 10:58:23 +02:00
@@ -1772,13 +1772,17 @@
 
 int handler::rename_table(const char * from, const char * to)
 {
-  DBUG_ENTER("handler::rename_table");
-  for (const char **ext=bas_ext(); *ext ; ext++)
+  int error= 0;
+  for (const char **ext= bas_ext(); *ext ; ext++)
   {
-    if (rename_file_ext(from,to,*ext))
-      DBUG_RETURN(my_errno);
+    if (rename_file_ext(from, to, *ext))
+    {
+      if ((error=my_errno) != ENOENT)
+	break;
+      error= 0;
+    }
   }
-  DBUG_RETURN(0);
+  return error;
 }
 
 /*

--- 1.36/sql/examples/ha_archive.cc	2005-04-27 22:20:55 +02:00
+++ 1.37/sql/examples/ha_archive.cc	2005-04-28 10:58:23 +02:00
@@ -447,35 +447,6 @@
 }
 
 
-/*
-  Rename all files that this handler defines in bas_ext list
-
-  NOTE Don't care if the .arn file is missing
-*/
-int ha_archive::rename_table(const char * from, const char * to)
-{
-  DBUG_ENTER("ha_archive::rename_table");
-  DBUG_PRINT("enter", ("from: %s, to: %s", from, to));
-  for (const char **ext=bas_ext(); *ext ; ext++)
-  {
-    // Check if the .arn file exists before rename
-    if (!my_strcasecmp(system_charset_info, *ext, ARN))
-    {
-      char name[FN_REFLEN];
-      (void)strxnmov(name, FN_REFLEN, from, ARN, NullS);
-      if (access(name, F_OK))
-      {
-        DBUG_PRINT("info", ("%s does not exist on disk, skipping it", name));
-        continue;
-      }
-    }
-    if (rename_file_ext(from,to,*ext))
-      DBUG_RETURN(my_errno);
-  }
-  DBUG_RETURN(0);
-}
-
-
 /* 
   When opening a file we:
   Create/get our shared structure.

--- 1.17/sql/examples/ha_archive.h	2005-04-27 12:51:30 +02:00
+++ 1.18/sql/examples/ha_archive.h	2005-04-28 10:58:23 +02:00
@@ -104,7 +104,6 @@
   int end_bulk_insert();
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
                              enum thr_lock_type lock_type);
-  int rename_table(const char * from, const char * to);
 };
 
 handlerton *archive_db_init(void);