Commit 1943e4e5 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents a64f234a 77001d2a

mysql-test/mysql-test-run.pl

+3 −3
Original line number Diff line number Diff line
@@ -484,11 +484,11 @@ sub initial_setup () { 
  #



  # Look for the path where to find the client binaries

  $path_client_bindir= mtr_path_exists("$glob_basedir/client",

  $path_client_bindir= mtr_path_exists("$glob_basedir/client/release",

				       "$glob_basedir/client/debug",

				       "$glob_basedir/client",

				       "$glob_basedir/client_release",

				       "$glob_basedir/client_debug",

				       "$glob_basedir/client/release",

				       "$glob_basedir/client/debug",

				       "$glob_basedir/bin");



  # Look for the mysqld executable