bk commit into 5.1 tree (cmiller:1.2234) BUG#16206

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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
  1.2234 06/07/03 13:49:25 cmiller@zippy.(none) +1 -0
  Additional patch from Bug#16206.  BEGIN/COMMIT behavior changed 5.0 -> 5.1 .

  mysql-test/r/bdb.result
    1.55 06/07/03 13:49:17 cmiller@zippy.(none) +2 -0
    Additional patch from Bug#16206.  BEGIN/COMMIT behavior changed 5.0 -> 5.1 .

# 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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1

--- 1.54/mysql-test/r/bdb.result	2006-07-03 11:14:29 -04:00
+++ 1.55/mysql-test/r/bdb.result	2006-07-03 13:49:17 -04:00
@@ -1974,7 +1974,9 @@ Log_name	Pos	Event_type	Server_id	End_lo
 f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
 f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         blackhole
 f	n	Query	1	n	use `test`; insert into bug16206 values(1)
+f	n	Query	1	n	use `test`; BEGIN
 f	n	Query	1	n	use `test`; insert into bug16206 values(2)
+f	n	Query	1	n	use `test`; COMMIT
 drop table bug16206;
 reset master;
 create table bug16206 (a int) engine=         bdb;