bk commit into 5.1 tree (joerg:1.2285) BUG#21721

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 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-08-18 18:24:38+02:00, joerg@trift2. +1 -0
  mysql-test-run.pl  :  Fix the search path for "ndb_mgmd" and "ndbd".  bug#21721

  mysql-test/mysql-test-run.pl@stripped, 2006-08-18 18:24:35+02:00, joerg@trift2. +4 -2
    In 5.1 packages, the binaries "ndbd" and "ndb_mgmd" are in subdirectory "bin", not in "libexec".
    Use the search function "mtr_exe_exists()", in case there might be exceptions.

# 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:	/M51/push-5.1

--- 1.150/mysql-test/mysql-test-run.pl	2006-08-18 18:24:46 +02:00
+++ 1.151/mysql-test/mysql-test-run.pl	2006-08-18 18:24:46 +02:00
@@ -1299,8 +1299,10 @@
     $path_ndb_tools_dir=  "$glob_basedir/bin";
     $exe_ndb_mgm=         "$glob_basedir/bin/ndb_mgm";
     $exe_ndb_waiter=      "$glob_basedir/bin/ndb_waiter";
-    $exe_ndbd=            "$glob_basedir/libexec/ndbd";
-    $exe_ndb_mgmd=        "$glob_basedir/libexec/ndb_mgmd";
+    $exe_ndbd=            mtr_exe_exists("$glob_basedir/libexec/ndbd",
+                                         "$glob_basedir/bin/ndbd");
+    $exe_ndb_mgmd=        mtr_exe_exists("$glob_basedir/libexec/ndb_mgmd",
+                                         "$glob_basedir/bin/ndb_mgmd");
   }
 
   $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;