bzr push into mysql-trunk-wl5824 branch (horst.hunger:3860 to 3861)

[horst.hunger]

 3861 horst.hunger@stripped	2012-03-15
      wl5824: Fixed bug in rpl test.

    modified:
      mysql-test/suite/memcached/r/rpl_memc271_2.result
      mysql-test/suite/memcached/t/rpl_memc271_2.test
 3860 horst.hunger@stripped	2012-03-15
      wl5824: Some beautifications and fixed rpl test.

    modified:
      mysql-test/suite/memcached/README
      mysql-test/suite/memcached/r/rpl_memc271_2.result
      mysql-test/suite/memcached/t/rpl_memc270_1.test
      mysql-test/suite/memcached/t/rpl_memc271_2-master.opt
      mysql-test/suite/memcached/t/rpl_memc271_2-slave.opt
      mysql-test/suite/memcached/t/rpl_memc271_2.test
=== modified file 'mysql-test/suite/memcached/r/rpl_memc271_2.result'
--- a/mysql-test/suite/memcached/r/rpl_memc271_2.result	2012-03-15 08:56:40 +0000
+++ b/mysql-test/suite/memcached/r/rpl_memc271_2.result	2012-03-15 11:20:21 +0000
@@ -201,7 +201,6 @@ F	NULL	Sachsenhausen
 H	Hamburg	Norderstedt
 connection master;
 DROP TABLE t1;
-DROP DATABASE innodb_memcache;
 connection slave;
 include/rpl_end.inc
 connection server_2;
@@ -226,4 +225,5 @@ disconnect server_2_1;
 disconnect server_1;
 disconnect server_1_1;
 connection default;
+DROP DATABASE innodb_memcache;
 SET @@global.tx_isolation= @tx_isolation;

=== modified file 'mysql-test/suite/memcached/t/rpl_memc271_2.test'
--- a/mysql-test/suite/memcached/t/rpl_memc271_2.test	2012-03-15 08:56:40 +0000
+++ b/mysql-test/suite/memcached/t/rpl_memc271_2.test	2012-03-15 11:20:21 +0000
@@ -248,10 +248,10 @@ SELECT c1,c2,c21 FROM t1;
 
 connection master;
 DROP TABLE t1;
-DROP DATABASE innodb_memcache;
 sync_slave_with_master;
 source include/rpl_end.inc;
 
 connection default; 
+DROP DATABASE innodb_memcache;
 SET @@global.tx_isolation= @tx_isolation;
 

No bundle (reason: useless for push emails).