bk commit into 4.1 tree (msvensson:1.2596)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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@stripped, 2006-10-23 12:16:40+02:00, msvensson@neptunus.(none) +1 -0
  If "var" is a symlink which does not point to anything, remove it before creating real var

  mysql-test/mysql-test-run.pl@stripped, 2006-10-23 12:16:38+02:00, msvensson@neptunus.(none) +5 -0
    If "var" is a symlink which does not point to anything, remove it 

# 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-4.1-maint

--- 1.123/mysql-test/mysql-test-run.pl	2006-10-23 12:16:43 +02:00
+++ 1.124/mysql-test/mysql-test-run.pl	2006-10-23 12:16:43 +02:00
@@ -1868,6 +1868,11 @@
 
     if ( ! -d $opt_vardir )
     {
+      if ( -l $opt_vardir and ! -d readlink($opt_vardir) )
+      {
+	mtr_report("Removing $opt_vardir symlink without destination");
+	unlink($opt_vardir);
+      }
       # The "var" dir does not exist already
       # the processes that mtr_kill_leftovers start will write
       # their log files to var/log so it should be created