bk commit into 5.1 tree (msvensson:1.2335)

[msvensson]

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-18 12:45:04+02:00, msvensson@shellback.(none) +3 -0
  No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore
  when mysql-test-run.pl has full control of all ndb processes. It will now know if
  install has failed.

  BitKeeper/deleted/.del-have_ndb_status_ok.require@stripped, 2006-09-18 12:37:02+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/r/have_ndb_status_ok.require

  mysql-test/include/have_ndb.inc@stripped, 2006-09-18 12:45:00+02:00, msvensson@shellback.(none) +0 -8
    Remove the test to check if environment variable NDB_STATUS_OK is set

  mysql-test/mysql-test-run.pl@stripped, 2006-09-18 12:45:00+02:00, msvensson@shellback.(none) +6 -9
    Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
    Use 1 and 0 to indicate if cluster has been installed ok.

# 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-maint

--- 1.172/mysql-test/mysql-test-run.pl	2006-09-18 12:45:12 +02:00
+++ 1.173/mysql-test/mysql-test-run.pl	2006-09-18 12:45:12 +02:00
@@ -1064,7 +1064,7 @@
    connect_string  => "$opt_ndbconnectstring",
    path_pid        => "$data_dir/ndb_3.pid", # Nodes + 1
    pid             => 0, # pid of ndb_mgmd
-   installed_ok    => 'NO',
+   installed_ok    => 0,
   };
 
   $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port_slave";
@@ -1077,7 +1077,7 @@
    connect_string  => "$opt_ndbconnectstring_slave",
    path_pid        => "$data_dir/ndb_2.pid", # Nodes + 1
    pid             => 0, # pid of ndb_mgmd
-   installed_ok    => 'NO',
+   installed_ok    => 0,
   };
 
   # Init pids of ndbd's
@@ -2278,21 +2278,18 @@
 
     next if !$cluster->{'pid'};
 
-    $cluster->{'installed_ok'}= "YES"; # Assume install suceeds
+    $cluster->{'installed_ok'}= 1; # Assume install suceeds
 
     if (ndbcluster_wait_started($cluster, ""))
     {
       # failed to install, disable usage and flag that its no ok
       mtr_report("ndbcluster_install of $cluster->{'name'} failed");
-      $cluster->{"installed_ok"}= "NO";
+      $cluster->{"installed_ok"}= 0;
 
       $cluster_started_ok= 0;
     }
   }
 
-  $ENV{'NDB_STATUS_OK'}=            $clusters->[0]->{'installed_ok'};
-  $ENV{'NDB_SLAVE_STATUS_OK'}=      $clusters->[1]->{'installed_ok'};
-
   if ( ! $cluster_started_ok )
   {
     if ( $opt_force)
@@ -2503,7 +2500,7 @@
   }
 
   # If test needs cluster, check that master installed ok
-  if ( $tinfo->{'ndb_test'}  and $clusters->[0]->{'installed_ok'} eq "NO" )
+  if ( $tinfo->{'ndb_test'}  and !$clusters->[0]->{'installed_ok'} )
   {
     mtr_report_test_name($tinfo);
     mtr_report_test_failed($tinfo);
@@ -2512,7 +2509,7 @@
 
   # If test needs slave cluster, check that it installed ok
   if ( $tinfo->{'ndb_test'}  and $tinfo->{'slave_num'} and
-       $clusters->[1]->{'installed_ok'} eq "NO" )
+       !$clusters->[1]->{'installed_ok'} )
   {
     mtr_report_test_name($tinfo);
     mtr_report_test_failed($tinfo);

--- 1.9/mysql-test/include/have_ndb.inc	2006-09-18 12:45:12 +02:00
+++ 1.10/mysql-test/include/have_ndb.inc	2006-09-18 12:45:12 +02:00
@@ -4,12 +4,4 @@
 show variables like "have_ndbcluster";
 enable_query_log;
 
-# Check that NDB is installed and known to be working
-# This will disable ndb from the shell script 'mysql-test-run'
-
--- require r/have_ndb_status_ok.require
-disable_query_log;
-eval select "$NDB_STATUS_OK" as ndb_status_ok;
-enable_query_log;
-