From 639c9dbc855af79b51d847c24330e6def6556d35 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Apr 2006 09:48:49 -0700 Subject: Bug #19083 ./mysql-test-run.pl starts NDB when it is not needed Now NDB is only initialized and started when the tests that are being run will make use of it. The same thing is also done for the slave databases and the instance manager. After review from Magnus: Only take a snapshot of the data directories that are in use. mysql-test/mysql-test-run.pl: Only initialize (and start) NDB, the instance manager, and the slaves when we have tests that require them. Also, only snapshot the data directories that we are going to use. mysql-test/ndb/ndbcluster.sh: Fix text message that has always annoyed me --- mysql-test/ndb/ndbcluster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/ndb') diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index c09c013552e..c17b3d316f4 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -232,8 +232,8 @@ cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" # test if Ndb Cluster starts properly -echo "Waiting for started..." -if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else +echo "Waiting for NDB data nodes to start..." +if ( $exec_waiter ) | grep -q "NDBT_ProgramExit: 0 - OK"; then :; else echo "Ndbcluster startup failed" stop_default_ndbcluster exit 1 -- cgit v1.2.1