Commit 4e289272 authored by kent@mysql.com's avatar kent@mysql.com

mysqlbinlog.test:

  Windows have no 'cat' command, use <
mysql.test:
  Windows can't handle single quotes in --exec line
parent 061d6606
...@@ -19,16 +19,16 @@ insert into t1 values(1); ...@@ -19,16 +19,16 @@ insert into t1 values(1);
--disable_query_log --disable_query_log
# Test delimiter : supplied on the command line # Test delimiter : supplied on the command line
select "Test delimiter : from command line" as " "; 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 # Test delimiter :; supplied on the command line
select "Test delimiter :; from command line" as " "; 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 # Test 'go' command (vertical output) \G
select "Test 'go' command(vertical output) \G" as " "; 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 # Test 'go' command \g
select "Test 'go' command \g" as " "; 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 --enable_query_log
drop table t1; drop table t1;
...@@ -37,7 +37,7 @@ drop table t1; ...@@ -37,7 +37,7 @@ drop table t1;
# #
create table t1(a int); create table t1(a int);
lock tables t1 write; lock tables t1 write;
--exec $MYSQL -e 'use test; select database();' --exec $MYSQL -e "use test; select database();"
unlock tables; unlock tables;
drop table t1; drop table t1;
...@@ -102,10 +102,10 @@ select "--- --position --" as ""; ...@@ -102,10 +102,10 @@ select "--- --position --" as "";
select "--- reading stdin --" as ""; select "--- reading stdin --" as "";
--enable_query_log --enable_query_log
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --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 --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 # clean up
drop table t1, t2; drop table t1, t2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment