database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

Browse Source 
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown
2000-12-29 16:09:30 +02:00
parent 07e250d328 a6ce6d3825
commit 53b6c99d04
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mysql-test-run.sh
View File

@ -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