From 1c2113de4078b0ab3e46042ba819b84cf8f91feb Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Fri, 13 Oct 2006 20:29:27 +0200
Subject: [PATCH] Look for client bindirs client_release and client_debug
 before other directories.

---
 mysql-test/mysql-test-run.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 24cdedce712..3cc0110ed05 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -468,11 +468,11 @@ sub initial_setup () {
   #
 
   # Look for the path where to find the client binaries
-  $path_client_bindir= mtr_path_exists("$glob_basedir/client/release",
+  $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
+				       "$glob_basedir/client_debug",
+				       "$glob_basedir/client/release",
 				       "$glob_basedir/client/debug",
 				       "$glob_basedir/client",
-				       "$glob_basedir/client_release",
-				       "$glob_basedir/client_debug",
 				       "$glob_basedir/bin");
 
   # Look for the mysqld executable
@@ -484,6 +484,7 @@ sub initial_setup () {
 				       "$path_client_bindir/mysqld-debug",
 				       "$path_client_bindir/mysqld-max",
 				       "$glob_basedir/libexec/mysqld",
+				       "$glob_basedir/bin/mysqld",
 				       "$glob_basedir/sql/release/mysqld",
 				       "$glob_basedir/sql/debug/mysqld");