diff options
author | unknown <dlenev@mysql.com> | 2003-09-29 23:10:30 +0400 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2003-09-29 23:10:30 +0400 |
commit | 55dc3dcb82dc13b182c1b44006ec3bde6b83af18 (patch) | |
tree | 5b3564d9eb7c88307ede7e8582dfa47c337e3955 /mysql-test/t/mysqlbinlog.test | |
parent | ad0a7a3034c4ea799b26842dc5cd66936b7f5f51 (diff) | |
download | mariadb-git-55dc3dcb82dc13b182c1b44006ec3bde6b83af18.tar.gz |
Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
client/mysqltest.c:
Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution).
mysql-test/t/mysqlbinlog.test:
Added additional replaces potentially needed after adding reset of replace conditions for exec
Diffstat (limited to 'mysql-test/t/mysqlbinlog.test')
-rw-r--r-- | mysql-test/t/mysqlbinlog.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 736c5e32622..22b63146652 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -40,10 +40,12 @@ select "--- Local --" as ""; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.001 + # this should not fail but shouldn't produce any working statements --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.002 # this should show almost nothing @@ -73,24 +75,28 @@ select "--- Remote --" as ""; # This is broken now # By the way it seems that remote version fetches all events with name >= master-bin.001 +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 # This is broken too --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # And this too ! (altough it is documented) --disable_query_log select "--- --database --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 # Strangely but this works --disable_query_log select "--- --position --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # clean up |