1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Now merge is done.

For previous commit I had run only rpl* tests, here the other ones had a 
few surprises. Latest status:
- all tests pass
- all replication tests pass with Valgrind
This is the final-final commit & push.
Doc remains.


client/mysqlbinlog.cc:
  Making remote mysqlbinlog work with the new format of 5.0.0, and still be 
  able to talk to older servers.
  This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
  work in Valgrind, too).
mysql-test/r/drop_temp_table.result:
  result update
mysql-test/r/insert_select.result:
  result update
mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/r/mysqlbinlog.result:
  result update
mysql-test/t/mix_innodb_myisam_binlog.test:
  position update
mysql-test/t/mysqlbinlog.test:
  position update
sql/log_event.cc:
  a comment (noticed the problem by watching the results of
  mix_innodb_myisam_binlog.test)
This commit is contained in:
unknown
2003-12-20 00:38:30 +01:00
parent 5084b6b701
commit bc3cbfbc7b
8 changed files with 184 additions and 112 deletions

View File

@@ -60,7 +60,7 @@ select "--- --database --" as "";
select "--- --position --" as "";
--enable_query_log
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=27 $MYSQL_TEST_DIR/var/log/master-bin.000002
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=118 $MYSQL_TEST_DIR/var/log/master-bin.000002
# These are tests for remote binlog.
# They should return the same as previous test.
@@ -97,7 +97,7 @@ select "--- --database --" as "";
select "--- --position --" as "";
--enable_query_log
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=118 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
# clean up
drop table t1, t2;