From: Date: November 10 2006 11:21am
Subject: bk commit into 5.0 tree (joerg:1.2284) BUG#17194
List-Archive: http://lists.mysql.com/commits/15120
X-Bug: 17194
Message-Id: <20061110102150.19FF21897@trift2.fambruehe>

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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-11-10 11:21:42+01:00, joerg@trift2. +1 -0
  mysql-test/mysql-test-run.pl  :    After-merge fix: Handle "mysqlmanager" (bug#17194).

  mysql-test/mysql-test-run.pl@stripped, 2006-11-10 11:21:39+01:00, joerg@trift2. +2 -1
    After-merge fix: Handle "mysqlmanager" (in a RPM install, it is in "/usr/sbin") (bug#17194).

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/bug17194-5.0

--- 1.117/mysql-test/mysql-test-run.pl	2006-11-10 11:21:49 +01:00
+++ 1.118/mysql-test/mysql-test-run.pl	2006-11-10 11:21:49 +01:00
@@ -1176,7 +1176,8 @@
                                            "$glob_basedir/sbin/mysqld");
     }
     $exe_im= mtr_exe_exists("$glob_basedir/libexec/mysqlmanager",
-                            "$glob_basedir/bin/mysqlmanager");
+                            "$glob_basedir/bin/mysqlmanager",
+                            "$glob_basedir/sbin/mysqlmanager");
     if ( $glob_use_embedded_server )
     {
       $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest_embedded");