diff options
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index ccf1aa81270..cb4d750624e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -188,7 +188,7 @@ done #-- MYRUN_DIR=$MYSQL_TEST_DIR/var/run -MASTER_MYDDIR="$MYSQL_TEST_DIR/var/lib" +MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data" MASTER_MYSOCK="$MYSQL_TMP_DIR/mysql-master.sock" MASTER_MYPID="$MYRUN_DIR/mysqld.pid" MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log" @@ -288,6 +288,8 @@ prompt_user () read unused } +# We can't use diff -u as this isn't portable + show_failed_diff () { reject_file=r/$1.reject @@ -296,7 +298,7 @@ show_failed_diff () then echo "Below are the diffs between actual and expected results:" echo "-------------------------------------------------------" - $DIFF -u $result_file $reject_file + $DIFF -c $result_file $reject_file echo "-------------------------------------------------------" echo "Please e-mail the above, along with the output of mysqlbug" echo "and any other relevant info to bugs@lists.mysql.com" |