Commit d6044081 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 1251df8e 395a1648

mysql-test/mysql-test-run.pl

+6 −2
Original line number Diff line number Diff line
@@ -1307,6 +1307,10 @@ sub executable_setup () { 
  $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

  $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");

  $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

  if ( $mysql_version_id >= 50100 )

  {

    $exe_mysqlslap=      mtr_exe_exists("$path_client_bindir/mysqlslap");

  }



  # Look for mysql_fix_system_table script

  $exe_mysql_fix_system_tables=
@@ -1540,7 +1544,7 @@ sub environment_setup () { 
  # ----------------------------------------------------

  # Setup env so childs can execute mysqlslap

  # ----------------------------------------------------

  unless ( $glob_win32 )

  if ( $exe_mysqlslap )

  {

    my $cmdline_mysqlslap=

      "$exe_mysqlslap -uroot " .