List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:January 13 2006 11:28pm
Subject:bk commit into 5.0 tree (jimw:1.2017)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.2017 06/01/13 15:28:23 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-15319
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/ha_berkeley.cc
    1.161 06/01/13 15:28:18 jimw@stripped +0 -0
    Auto 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.160/sql/ha_berkeley.cc	2005-11-20 10:46:59 -08:00
+++ 1.161/sql/ha_berkeley.cc	2006-01-13 15:28:18 -08:00
@@ -2059,13 +2059,19 @@
 {
   int error;
   char name_buff[FN_REFLEN];
-  DBUG_ENTER("delete_table");
-  if ((error=db_create(&file, db_env, 0)))
-    my_errno=error; /* purecov: inspected */
+  DBUG_ENTER("ha_berkeley::delete_table");
+  if ((error= db_create(&file, db_env, 0)))
+    my_errno= error; /* purecov: inspected */
   else
-    error=file->remove(file,fn_format(name_buff,name,"",ha_berkeley_ext,2 | 4),
-		       NULL,0);
-  file=0;					// Safety
+  {
+    error= file->remove(file, fn_format(name_buff, name, "", ha_berkeley_ext,
+                                        MY_REPLACE_EXT | MY_UNPACK_FILENAME),
+                        NULL, 0);
+    /* If BDB couldn't do it, just brute force the removal. */
+    if (error)
+      error= my_delete(name_buff, MYF(0));
+  }
+  file= 0;					// Safety
   DBUG_RETURN(error);
 }
 
Thread
bk commit into 5.0 tree (jimw:1.2017)Jim Winstead14 Jan