bk commit into 4.1 tree (msvensson:1.2289)

[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
  1.2289 05/05/25 11:10:10 msvensson@neptunus.(none) +1 -0
  Use one err file for each master 

  mysql-test/mysql-test-run.sh
    1.252 05/05/25 11:10:07 msvensson@neptunus.(none) +2 -2
    Add master id to end of MASTER_MY_ERR  so that both masters doesnt write to the same file.

# 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

--- 1.251/mysql-test/mysql-test-run.sh	2005-05-18 10:56:59 +02:00
+++ 1.252/mysql-test/mysql-test-run.sh	2005-05-25 11:10:07 +02:00
@@ -1181,8 +1181,8 @@
            $NOT_FIRST_MASTER_EXTRA_OPTS"
   fi
 
-  CUR_MYERR=$MASTER_MYERR
-  CUR_MYSOCK=$MASTER_MYSOCK
+  CUR_MYERR=$MASTER_MYERR$1
+  CUR_MYSOCK=$MASTER_MYSOCK$1
 
   # For embedded server we collect the server flags and return
   if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then