Commit 524914b2 authored by unknown's avatar unknown
Browse files

mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries, 

because searching for them makes the script abort with all non-NDB builds.


mysql-test/mysql-test-run.pl:
  Checking with "mtr_exe_exists()" for the location of a binary will yield an error
  if the binary is found nowhere at all, and this happens with NDB binaries in all
  builds that do not contain NDB;  so the correct way is fixed path names only.
  Still part of the fix for the #21721 bug.
parent 2d766479

mysql-test/mysql-test-run.pl

+2 −4
Original line number Diff line number Diff line
@@ -1299,10 +1299,8 @@ sub executable_setup () { 
    $path_ndb_tools_dir=  "$glob_basedir/bin";

    $exe_ndb_mgm=         "$glob_basedir/bin/ndb_mgm";

    $exe_ndb_waiter=      "$glob_basedir/bin/ndb_waiter";

    $exe_ndbd=            mtr_exe_exists("$glob_basedir/libexec/ndbd",

                                         "$glob_basedir/bin/ndbd");

    $exe_ndb_mgmd=        mtr_exe_exists("$glob_basedir/libexec/ndb_mgmd",

                                         "$glob_basedir/bin/ndb_mgmd");

    $exe_ndbd=            "$glob_basedir/bin/ndbd";

    $exe_ndb_mgmd=        "$glob_basedir/bin/ndb_mgmd";

  }



  $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;