mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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
This commit is contained in:
@ -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"
|
||||
|
Reference in New Issue
Block a user