List:Commits« Previous MessageNext Message »
From:Daniel Fischer Date:December 7 2006 1:37pm
Subject:bk commit into 5.0 tree (df:1.2325)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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, 2006-12-07 14:36:56+01:00, df@stripped +1 -0
  Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
  into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-work
  MERGE: 1.1616.2843.20

  mysql-test/mysql-test-run.pl@stripped, 2006-12-07 14:36:53+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.8.14.6

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.0-work/RESYNC

--- 1.158/mysql-test/mysql-test-run.pl	2006-12-01 10:27:15 +01:00
+++ 1.159/mysql-test/mysql-test-run.pl	2006-12-07 14:36:53 +01:00
@@ -786,6 +786,9 @@ sub command_line_setup () {
     {
       # Only platforms that have native symlinks can use the vardir trick
       $opt_mem= $opt_vardir;
+      # Delete the default directory in case it exists since we're going to create
+      # a new one later anyway, and the mkpath below throws a fatal error otherwise
+      eval { rmtree($default_vardir, 1, 1); };
       mtr_report("Using 4.1 vardir trick");
     }
 
Thread
bk commit into 5.0 tree (df:1.2325)Daniel Fischer7 Dec