bzr commit into mysql-5.5-innodb branch (vasil.dimov:3261)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:vasil.dimov@stripped

 3261 Vasil Dimov	2010-12-14 [merge]
      Merge mysql-5.1-innodb -> mysql-5.5-innodb

    modified:
      mysql-test/suite/innodb/t/innodb_bug57255.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug57255.test'
--- a/mysql-test/suite/innodb/t/innodb_bug57255.test	revid:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug57255.test	revid:vasil.dimov@stripped
@@ -12,6 +12,7 @@ create table C(id int not null auto_incr
 insert into A values(1), (2);
 
 --disable_query_log
+begin;
 let $i=257;
 while ($i)
 {
@@ -24,6 +25,7 @@ while ($i)
 insert into C(f1) values(2);
 dec $i;
 }
+commit;
 --enable_query_log
 
 # Following Deletes should not report error

No bundle (reason: revision is a merge).