Commit 47c46e25 authored Jan 25, 2005 by unknown

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

parents b9ae83d5 e749259d

ndb/test/run-test/atrt-mysql-test-run

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@ p=`pwd`
		cd $MYSQL_BASE_DIR/mysql-test
		./mysql-test-run --with-ndbcluster --ndb-connectstring=$NDB_CONNECTSTRING $* \| tee $p/output.txt

		f=`grep -c fail $p/output.txt`
		o=`grep -c pass $p/output.txt`
		f=`grep -c '\[ fail \]' $p/output.txt`
		o=`grep -c '\[ pass \]' $p/output.txt`

		if [ $o -gt 0 -a $f -eq 0 ]
		then

ndb/test/run-test/daily-basic-tests.txt

+8 −0

Original line number	Diff line number	Diff line
		max-time: 25000
		cmd: atrt-mysql-test-run
		args: --force

		max-time: 600
		cmd: atrt-testBackup
		args: -n BackupOne T1 T6 T3 I3

		# BASIC FUNCTIONALITY
		max-time: 500
		cmd: testBasic

ndb/test/run-test/daily-devel-tests.txt

+0 −8

Original line number	Diff line number	Diff line
		max-time: 2500
		cmd: atrt-mysql-test-run
		args: --do-test=ndb --force

		#
		# INDEX
		#
		@@ -22,10 +18,6 @@ args: -n CreateLoadDrop T1 T10
		#
		# BACKUP
		#
		max-time: 600
		cmd: atrt-testBackup
		args: -n BackupOne T1 T6 T3 I3

		max-time: 1000
		cmd: atrt-testBackup
		args: -n BackupBank T6