database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source
This commit is contained in:
msvensson@shellback.(none)
2006-10-12 20:52:53 +02:00
parent 889e7147f6
commit 31f4aaa5be
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.pl
View File

@ -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 () {
$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;
} }