MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:September 11 2006 10:15am
Subject:bk commit into 5.1 tree (msvensson:1.2314)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-11 12:15:04+02:00, msvensson@shellback.(none) +1 -0
  Use the mtr_file_exists function to detect if ndbapi_example is available

  mysql-test/mysql-test-run.pl@stripped, 2006-09-11 12:15:00+02:00, msvensson@shellback.(none) +2 -3
    Use the mtr_file_exists function to detect if ndbapi_example is available

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.165/mysql-test/mysql-test-run.pl	2006-09-11 12:15:11 +02:00
+++ 1.166/mysql-test/mysql-test-run.pl	2006-09-11 12:15:11 +02:00
@@ -1238,8 +1238,7 @@
                         "/usr/bin/false");
     $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
     $path_ndb_examples_dir= mtr_path_exists("$glob_basedir/storage/ndb/ndbapi-examples");
-    $exe_ndb_example= mtr_exe_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple",
-				    $exe_mysqld);
+    $exe_ndb_example=    mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple");
     $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
     $exe_ndb_waiter=     "$glob_basedir/storage/ndb/tools/ndb_waiter";
     $exe_ndbd=           "$glob_basedir/storage/ndb/src/kernel/ndbd";
@@ -1419,7 +1418,7 @@
   $ENV{'NDB_CONNECTSTRING'}=        $opt_ndbconnectstring;
 
   $ENV{'NDB_EXAMPLES_DIR'}=         $path_ndb_examples_dir;
-  $ENV{'MY_NDB_EXAMPLES_BINARY'}=   ($exe_ndb_example eq "$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple")?$exe_ndb_example:"";
+  $ENV{'MY_NDB_EXAMPLES_BINARY'}=   $exe_ndb_example;
   $ENV{'NDB_EXAMPLES_OUTPUT'}=      $file_ndb_testrun_log;
 
   # ----------------------------------------------------
Thread
bk commit into 5.1 tree (msvensson:1.2314)msvensson11 Sep