mysqlbinlog.test:

  Windows have no 'cat' command, use <
mysql.test:
  Windows can't handle single quotes in --exec line


mysql-test/t/mysql.test:
  Windows can't handle single quotes in --exec line
mysql-test/t/mysqlbinlog.test:
  Windows have no 'cat' command, use <

2 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index c1d9813ea39..0b031ea1be8 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -19,16 +19,16 @@ insert into t1 values(1);
 --disable_query_log
 # Test delimiter : supplied on the command line
 select "Test delimiter : from command line" as " ";
---exec $MYSQL test --delimiter=':' -e 'select * from t1:'
+--exec $MYSQL test --delimiter=":" -e "select * from t1:"
 # Test delimiter :; supplied on the command line
 select "Test delimiter :; from command line" as " ";
---exec $MYSQL test --delimiter=':;' -e 'select * from t1:;'
+--exec $MYSQL test --delimiter=":;" -e "select * from t1:;"
 # Test 'go' command (vertical output) \G
 select "Test 'go' command(vertical output) \G" as " ";
---exec $MYSQL test -e 'select * from t1\G'
+--exec $MYSQL test -e "select * from t1\G"
 # Test 'go' command \g
 select "Test  'go' command \g" as " ";
---exec $MYSQL test -e 'select * from t1\g'
+--exec $MYSQL test -e "select * from t1\g"
 --enable_query_log
 drop table t1;
 
@@ -37,7 +37,7 @@ drop table t1;
 #
 create table t1(a int);
 lock tables t1 write;
---exec $MYSQL -e 'use test; select database();'
+--exec $MYSQL -e "use test; select database();"
 unlock tables;
 drop table t1;
 
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index e5bd8c554cb..61d7d9994ba 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -102,10 +102,10 @@ select "--- --position --" as "";
 select "--- reading stdin --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec cat $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | $MYSQL_BINLOG --short-form - 
+--exec $MYSQL_BINLOG --short-form - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec cat $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | $MYSQL_BINLOG --short-form --position=79 - 
+--exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
 
 # clean up
 drop table t1, t2;