Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-30 21:43:05+03:00, aelkin@stripped +2 -0
WL#3368 mixed format as default
Two minor fixes:
1. to make make test executes with mixed;
2. proper isolation of binlog_statement_insert_delayed
from others through reset master cleaning up binlog
todo: adapt this technique to other restarting for binlog tests
Makefile.am@stripped, 2006-08-30 21:42:59+03:00, aelkin@stripped +5 -1
Binlog format switches to MIXED. A new Makefile target
test-binlog-statement
is introduced for checking tests requiring exclusive STATEMENT format.
mysql-test/t/binlog_statement_insert_delayed.test@stripped, 2006-08-30 21:43:00+03:00, aelkin@stripped +3 -0
cheapest method to clean up binlog after previous tests
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: aelkin
# Host: dsl-hkigw8-feaaf900-177.dhcp.inet.fi
# Root: /net/nb/home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default
--- 1.94/Makefile.am 2006-08-30 21:43:31 +03:00
+++ 1.95/Makefile.am 2006-08-30 21:43:31 +03:00
@@ -118,7 +118,7 @@
test-ps:
cd mysql-test ; \
- ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement
+ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
test-nr:
cd mysql-test ; \
@@ -129,6 +129,10 @@
./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row
test-ns:
+ cd mysql-test ; \
+ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed
+
+test-binlog-statement:
cd mysql-test ; \
./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
--- 1.1/mysql-test/t/binlog_statement_insert_delayed.test 2006-08-30 21:43:31 +03:00
+++ 1.2/mysql-test/t/binlog_statement_insert_delayed.test 2006-08-30 21:43:31 +03:00
@@ -3,4 +3,7 @@
-- source include/not_embedded.inc
-- source include/have_binlog_format_statement.inc
+-- disable_query_log
+reset master; # get rid of previous tests binlog
+-- enable_query_log
-- source extra/binlog_tests/binlog_insert_delayed.test
| Thread |
|---|
| • bk commit into 5.1 tree (aelkin:1.2256) | Andrei Elkin | 30 Aug |
