Commit 7a9085c6 authored by unknown's avatar unknown

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

parent 23e94150
...@@ -1386,12 +1386,15 @@ sub executable_setup () { ...@@ -1386,12 +1386,15 @@ sub executable_setup () {
mtr_exe_exists("$ndb_path/src/kernel/ndbd", mtr_exe_exists("$ndb_path/src/kernel/ndbd",
"$glob_basedir/bin/ndbd"); "$glob_basedir/bin/ndbd");
if ( $mysql_version_id >= 50000 )
{
$path_ndb_examples_dir= $path_ndb_examples_dir=
mtr_path_exists("$ndb_path/ndbapi-examples", mtr_path_exists("$ndb_path/ndbapi-examples",
"$ndb_path/examples"); "$ndb_path/examples");
$exe_ndb_example= $exe_ndb_example=
mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple"); mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple");
} }
}
# Look for the udf_example library # Look for the udf_example library
$lib_udf_example= $lib_udf_example=
...@@ -1548,8 +1551,11 @@ sub environment_setup () { ...@@ -1548,8 +1551,11 @@ sub environment_setup () {
$ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log;
$ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring; $ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring;
if ( $mysql_version_id >= 50000 )
{
$ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir; $ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir;
$ENV{'MY_NDB_EXAMPLES_BINARY'}= $exe_ndb_example; $ENV{'MY_NDB_EXAMPLES_BINARY'}= $exe_ndb_example;
}
$ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment