Commit 8143ab23 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Manual merge
parents c5f7e078 e8d8ddad

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ 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', ''),