mirror of
https://github.com/MariaDB/server.git
synced 2025-07-02 14:22:51 +03:00
support for eval_result and let $var = query
syntax in mysql-test
fixes for rpl_log test to make it config-independent BitKeeper/etc/ignore: Added mysql-test/r/rpl_log.eval to the ignore list client/mysqltest.c: support for eval_result and let $var = `query` syntax mysql-test/Makefile.am: import more variables into mysql-test-run mysql-test/mysql-test-run.sh: if we got wrong result on eval_result test case, diff against the expanded result, not the template mysql-test/r/rpl_log.result: change config-dependent parts of the result to dynamic variables mysql-test/t/rpl_log.test: get server version from the server remove obsoleted replace hack to solve port problem - use eval_result instead
This commit is contained in:
@ -333,6 +333,13 @@ show_failed_diff ()
|
||||
{
|
||||
reject_file=r/$1.reject
|
||||
result_file=r/$1.result
|
||||
eval_file=r/$1.eval
|
||||
|
||||
if [ -f $eval_file ]
|
||||
then
|
||||
result_file=$eval_file
|
||||
fi
|
||||
|
||||
if [ -x "$DIFF" ] && [ -f $reject_file ]
|
||||
then
|
||||
echo "Below are the diffs between actual and expected results:"
|
||||
|
Reference in New Issue
Block a user