Merge shellback.(none):/home/msvensson/mysql/mysql-5.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

client/mysqltest.c

@@ -2518,7 +2518,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user,
 {
   int con_error= 1;
   my_bool reconnect= 1;
-  static int connection_retry_sleep= 2; /* Seconds */
+  static ulong connection_retry_sleep= 100000; /* Microseconds */
   int i;
   for (i= 0; i < opt_max_connect_retries; i++)
   {
@@ -2528,7 +2528,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user,
       con_error= 0;
       break;
     }
-    sleep(connection_retry_sleep);
+    my_sleep(connection_retry_sleep);
   }
   /*
    TODO: change this to 0 in future versions, but the 'kill' test relies on
@@ -3298,7 +3298,7 @@ static struct my_option my_long_options[] =
   {"max-connect-retries", OPT_MAX_CONNECT_RETRIES,
    "Max number of connection attempts when connecting to server",
    (gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0,
-   GET_INT, REQUIRED_ARG, 5, 1, 10, 0, 0, 0},
+   GET_INT, REQUIRED_ARG, 500, 1, 10000, 0, 0, 0},
   {"password", 'p', "Password to use when connecting to server.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to use for connection.", (gptr*) &port,

mysql-test/lib/mtr_report.pl

@@ -21,6 +21,7 @@ sub mtr_warning (@);
 sub mtr_error (@);
 sub mtr_child_error (@);
 sub mtr_debug (@);
+sub mtr_verbose (@);
 
 
 ##############################################################################
@@ -122,7 +123,7 @@ sub mtr_report_test_failed ($) {
   {
     print "[ fail ]  timeout\n";
   }
-  elsif ( $tinfo->{'ndb_test'} and  !$::flag_ndb_status_ok)
+  elsif ( $tinfo->{'ndb_test'} and $::cluster->[0]->{'installed_ok'} eq "NO")
   {
     print "[ fail ]  ndbcluster start failure\n";
     return;
@@ -157,6 +158,7 @@ sub mtr_report_stats ($) {
   my $tot_passed= 0;
   my $tot_failed= 0;
   my $tot_tests=  0;
+  my $tot_restarts= 0;
   my $found_problems= 0;            # Some warnings are errors...
 
   foreach my $tinfo (@$tests)
@@ -175,6 +177,10 @@ sub mtr_report_stats ($) {
       $tot_tests++;
       $tot_failed++;
     }
+    if ( $tinfo->{'restarted'} )
+    {
+      $tot_restarts++;
+    }
   }
 
   # ----------------------------------------------------------------------
@@ -197,6 +203,8 @@ sub mtr_report_stats ($) {
       "the documentation at\n",
       "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
   }
+  print
+    "The servers was restarted $tot_restarts times\n";
 
   # ----------------------------------------------------------------------
   # If a debug run, there might be interesting information inside
@@ -335,5 +343,11 @@ sub mtr_debug (@) {
     print STDERR "####: ",join(" ", @_),"\n";
   }
 }
+sub mtr_verbose (@) {
+  if ( $::opt_verbose )
+  {
+    print STDERR "> ",join(" ", @_),"\n";
+  }
+}
 
 1;

mysql-test/lib/mtr_stress.pl

@@ -27,8 +27,7 @@ sub run_stress_test ()
 
   if ( ! $::glob_use_embedded_server and ! $::opt_local_master )
   {
-    $::master->[0]->{'pid'}= mysqld_start('master',0,[],[],0);
-    if ( ! $::master->[0]->{'pid'} )
+    if ( ! mysqld_start($::master->[0],[],[]) )
     {
       mtr_error("Can't start the mysqld server");
     }

storage/ndb/tools/waiter.cpp

@@ -92,7 +92,7 @@ int main(int argc, char** argv){
     wait_status= NDB_MGM_NODE_STATUS_STARTED;
   }
 
-  if (waitClusterStatus(_hostName, wait_status, _timeout) != 0)
+  if (waitClusterStatus(_hostName, wait_status, _timeout*10) != 0)
     return NDBT_ProgramExit(NDBT_FAILED);
   return NDBT_ProgramExit(NDBT_OK);
 }
@@ -311,7 +311,7 @@ waitClusterStatus(const char* _addr,
     }
     g_info << "Waiting for cluster enter state " 
 	    << ndb_mgm_get_node_status_string(_status)<< endl;
-    NdbSleep_SecSleep(1);
+    NdbSleep_MilliSleep(100);
     attempts++;
   }
   return 0;