Commit e3a9d949 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 90c57042 e8d8ddad

mysql-test/mysql-test-run.pl

+3 −2
Original line number Diff line number Diff line
@@ -676,11 +676,12 @@ sub command_line_setup () { 
  # number as early as possible

  #



  # Look for the client binaries

  # Look for the client binaries directory

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

				       "$glob_basedir/client_debug",

				       vs_config_dirs('client', ''),

				       "$glob_basedir/client");

				       "$glob_basedir/client",

				       "$glob_basedir/bin/");



  $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),

				       "$glob_basedir/sql/mysqld",