bzr push into mysql-5.1 branch (msvensson:2612 to 2613) WL#4189

[Magnus Svensson]

 2613 Magnus Svensson	2008-06-16
      WL#4189
       - Increase start timeout to 180 seconds, old version had 400 that is too much
modified:
  mysql-test/mysql-test-run.pl

 2612 Magnus Svensson	2008-06-16
      WL#4189
       - Fix make_binary_distribution.sh after removing mysql-test/ndb dir
modified:
  mysql-test/Makefile.am
  scripts/make_binary_distribution.sh

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2008-05-30 09:12:07 +0000
+++ b/mysql-test/Makefile.am	2008-06-16 09:21:30 +0000
@@ -60,7 +60,7 @@ TEST_DIRS = t r include std_data std_dat
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
 	suite/bugs/data suite/bugs/t suite/bugs/r \
 	suite/federated \
-	suite/funcs_1 suite/funcs_1/bitdata suite/funcs_1/data \
+	suite/funcs_1 suite/funcs_1/bitdata \
 	suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \
 	suite/funcs_1/t suite/funcs_1/views suite/funcs_1/cursors \
 	suite/funcs_1/datadict suite/funcs_1/storedproc suite/funcs_1/triggers \

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-05-30 09:12:07 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-06-16 09:23:00 +0000
@@ -153,7 +153,7 @@ my $opt_sleep;
 my $opt_testcase_timeout=    15; # 15 minutes
 my $opt_suite_timeout   =   180; # 3 hours
 my $opt_shutdown_timeout=    10; # 10 seconds
-my $opt_start_timeout   =    30; # 30 seconds
+my $opt_start_timeout   =   180; # 180 seconds
 
 my $opt_start;
 my $opt_start_dirty;

=== modified file 'scripts/make_binary_distribution.sh'
--- a/scripts/make_binary_distribution.sh	2008-05-13 13:56:07 +0000
+++ b/scripts/make_binary_distribution.sh	2008-06-16 09:21:30 +0000
@@ -369,13 +369,12 @@ fi
 # NDB Cluster
 if [ x$NDBCLUSTER = x1 ]; then
   ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
-  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
   $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
   $CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/.
   $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
-  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
+  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/.
   rm -rf $BASE/ndb-stage
 fi