diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-05 22:34:33 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-05 22:34:33 +0300 |
| commit | b89367f2f8ad437551a449825f0e03dea553fcce (patch) | |
| tree | 12f68ee51e11c2152bfc43d6c7613a7d392f82bc /mysql-test/t/mysqlbinlog2.test | |
| parent | 67da87d82e15f2efd81be1ed11384204215c23fd (diff) | |
| download | mariadb-git-b89367f2f8ad437551a449825f0e03dea553fcce.tar.gz | |
Fixes for tests after merge from 5.0
mysql-test/r/grant.result:
Fixed a result. Editor added wrong characters.
mysql-test/r/mysqlbinlog2.result:
Fixed
mysql-test/r/sp.result:
Fixed a result, moved lines around.
mysql-test/r/sp_trans.result:
Fixed a result, moved lines around.
mysql-test/t/mysqlbinlog2.test:
Merged tests from 5.0
mysql-test/t/sp_trans.test:
Merged test from 5.0 and fixed to be compatible with 5.1
sql/sql_class.cc:
Merged from 5.0
sql/sql_error.cc:
Fixed push_warning()
Diffstat (limited to 'mysql-test/t/mysqlbinlog2.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog2.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index a7014706f09..ac647f772b1 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -60,7 +60,7 @@ select "--- stop-position --" as ""; --disable_query_log select "--- start and stop positions ---" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=600 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -115,14 +115,14 @@ select "--- start-position --" as ""; --enable_query_log --exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log -select "--- start and stop positions ---" as ""; ---enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=600 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 ---disable_query_log select "--- stop-position --" as ""; --enable_query_log --exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log +select "--- start and stop positions ---" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--disable_query_log select "--- start-datetime --" as ""; --enable_query_log --exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 |