Fix tests after merge

Straighten out and comment behaviour for --require and --result in run_query


client/mysqltest.c:
   If --require or --result has been provided for a query command->record_file file be set.
  In that case it should either dump to file if recording or check with content in file if running.
mysql-test/r/mysqltest.result:
  Fix up tests and results after merge
mysql-test/t/mysqltest.test:
  Fix up tests and results after merge

1 files changed, 9 insertions, 9 deletions

diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 1d22705fb8e..132a6329178 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -984,7 +984,7 @@ select "this will be executed";
 #            non-1st queries
 #
 
-# Failing multi statement query
+echo Failing multi statement query;
 # PS does not support multi statement
 --exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql
 --exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql
@@ -999,14 +999,13 @@ select "this will be executed";
 drop table t1;
 
 --error 1
---exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out
-# The .out file should be empty, cat will fail!
---error 1
---exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
+# The .out file should be non existent
+--exec test ! -e $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;
 
 
-# Using expected error
+echo Multi statement using expected error;
 # PS does not support multi statement
 --exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql
 --exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql
@@ -1018,11 +1017,12 @@ drop table t1;
 --exec echo "delimiter ;||||"                         >> var/tmp/bug11731.sql
 
 # These two should work since the error is expected
---exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql  2>&1
+--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql 2>&1
 drop table t1;
 
---exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out
---exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
+# The .out file should exist
+--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;