bk commit into 5.1 tree (msvensson:1.2548)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2007-06-07 14:33:45+02:00, msvensson@pilot.(none) +2 -0
  Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
  into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2944.43

  mysql-test/extra/binlog_tests/blackhole.test@stripped, 2007-06-07 14:33:42+02:00,
msvensson@pilot.(none) +0 -0
    Auto merged
    MERGE: 1.4.8.2

  mysql-test/extra/binlog_tests/blackhole.test@stripped, 2007-06-07 14:33:42+02:00,
msvensson@pilot.(none) +0 -0
    Merge rename: mysql-test/t/blackhole.test ->
mysql-test/extra/binlog_tests/blackhole.test

  mysql-test/t/backup.test@stripped, 2007-06-07 14:33:42+02:00, msvensson@pilot.(none) +0 -0
    Auto merged
    MERGE: 1.16.2.5

# 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:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.4.8.1/mysql-test/t/blackhole.test	2007-06-07 14:25:16 +02:00
+++ 1.17/mysql-test/extra/binlog_tests/blackhole.test	2007-06-07 14:33:42 +02:00
@@ -125,10 +125,7 @@ select * from t2;
 select * from t3;
 
 let $VERSION=`select version()`;
---replace_result $VERSION VERSION
---replace_column 2 # 5 #
-show binlog events;
-
+source include/show_binlog_events.inc;
 drop table t1,t2,t3;
 
 #
@@ -136,7 +133,6 @@ drop table t1,t2,t3;
 #             table
 #
 CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;
---error 1031
 INSERT DELAYED INTO t1 VALUES(1);
 DROP TABLE t1;
 
@@ -158,3 +154,21 @@ DELETE FROM t1 WHERE a=10;
 DROP TABLE t1;
 
 # End of 5.0 tests
+
+# Test that a transaction which is rolled back does not go into binlog
+# and that a transaction which is committed does
+
+reset master;
+create table t1 (a int) engine=blackhole;
+set autocommit=0;
+start transaction;
+insert into t1 values(1);
+commit;
+start transaction;
+insert into t1 values(2);
+rollback;
+set autocommit=1;
+source include/show_binlog_events.inc;
+drop table if exists t1;
+
+# End of 5.1 tests

--- 1.24/mysql-test/t/backup.test	2007-01-16 19:36:42 +01:00
+++ 1.25/mysql-test/t/backup.test	2007-06-07 14:33:42 +02:00
@@ -1,3 +1,8 @@
+
+# The server need to be started in $MYSQLTEST_VARDIR since it
+# uses ../std_data_ln/
+-- source include/uses_vardir.inc
+
 #
 # This test is a bit tricky as we can't use backup table to overwrite an old
 # table