diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
| commit | 63c7276f365c4f00168d75e3a1d63bb959df1dc1 (patch) | |
| tree | ae1d8d4885a5aa3e83ca4246b189760e128283c3 /mysql-test | |
| parent | 9def70036f82bc3d9338b1584226451bbe88ab96 (diff) | |
| download | mariadb-git-63c7276f365c4f00168d75e3a1d63bb959df1dc1.tar.gz | |
Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix for 'mysqladmin -w1 unknown-command'
libmysql/violite.c:
Fix for TCP_NODELAY
mysql-test/mysql-test-run.sh:
Portability fixes
sql/sql_lex.cc:
Cleanup
sql/sql_lex.h:
Cleanup
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 35b29307895..d27664e7a8f 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -273,8 +273,7 @@ DASH72=`$ECHO '----------------------------------------------------------------- # on binary, use what is installed if [ x$SOURCE_DIST = x1 ] ; then MYSQLD="$BASEDIR/sql/mysqld" - if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then - [ -e "$BASEDIR/client/.libs/lt-mysqltest" ] || $BASEDIR/client/mysqltest -V + if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" else MYSQL_TEST="$BASEDIR/client/mysqltest" @@ -350,7 +349,7 @@ prompt_user () read unused } -# We can't use diff -u as this isn't portable +# We can't use diff -u or diff -a as these are not portable show_failed_diff () { @@ -367,7 +366,7 @@ show_failed_diff () then echo "Below are the diffs between actual and expected results:" echo "-------------------------------------------------------" - $DIFF -c -a $result_file $reject_file + $DIFF -c $result_file $reject_file echo "-------------------------------------------------------" echo "Please follow the instructions outlined at" echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html" |