diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-29 16:09:30 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-29 16:09:30 +0200 |
| commit | 568cb5973da2d520633c08582675ba69612f26b3 (patch) | |
| tree | c869ff7b38fd9ca18dc3dffcadf4c09433fcb52a /mysql-test/mysql-test-run.sh | |
| parent | 6c04eda14559a83ad46b281718c5819db0a8773e (diff) | |
| parent | 9f358065bf076fcdbb2af056aba5ba8ab9ccbb5d (diff) | |
| download | mariadb-git-568cb5973da2d520633c08582675ba69612f26b3.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rwxr-xr-x | mysql-test/mysql-test-run.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d16e72f0a6a..8ff75be324a 100755 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -191,7 +191,7 @@ error () { } error_is () { - $ECHO `$CAT $TIMEFILE` | $SED -e 's/.* At line .*\: \(.*\)Command .*$/ \>\> Error: \1<\</' + $ECHO `$CAT $TIMEFILE` | $SED -e 's/.* At line \(.*\)\: \(.*\)Command .*$/ \>\> Error at line \1: \2<\</' } prefix_to_8() { @@ -497,7 +497,7 @@ run_testcase () timestr="$USERT $SYST $REALT" pname=`$ECHO "$tname "|$CUT -c 1-16` - $SETCOLOR_NORMAL && $ECHO -n "$pname $timestr" + $ECHO -n "$pname $timestr" @@ -520,7 +520,6 @@ run_testcase () exit 1 fi -# $ECHO "Restarting mysqld" mysql_restart $ECHO "Resuming Tests" $ECHO |