Commit 7a9085c6 authored by unknown's avatar unknown
Browse files

Skip looking for ndbapi-examples in 4.1, not part of dist

parent 23e94150

mysql-test/mysql-test-run.pl

+13 −7
Original line number Diff line number Diff line
@@ -1386,12 +1386,15 @@ sub executable_setup () { 
      mtr_exe_exists("$ndb_path/src/kernel/ndbd",

		     "$glob_basedir/bin/ndbd");



    if ( $mysql_version_id >= 50000 )

    {

      $path_ndb_examples_dir=

	mtr_path_exists("$ndb_path/ndbapi-examples",

			"$ndb_path/examples");

      $exe_ndb_example=

	mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple");

    }

  }



  # Look for the udf_example library

  $lib_udf_example=
@@ -1548,8 +1551,11 @@ sub environment_setup () { 
    $ENV{'NDB_TOOLS_OUTPUT'}=         $path_ndb_testrun_log;

    $ENV{'NDB_CONNECTSTRING'}=        $opt_ndbconnectstring;



    if ( $mysql_version_id >= 50000 )

    {

      $ENV{'NDB_EXAMPLES_DIR'}=         $path_ndb_examples_dir;

      $ENV{'MY_NDB_EXAMPLES_BINARY'}=   $exe_ndb_example;

    }

    $ENV{'NDB_EXAMPLES_OUTPUT'}=      $path_ndb_testrun_log;

  }