bzr push into mysql-trunk branch (sergey.vojtovich:3895 to 3896) WL#6216

[Sergey Vojtovich]

 3896 Sergey Vojtovich	2012-06-23
      WL#6216 - Changes to Server defaults in 5.6
      
      Fixed parts.partition-dml-1-11-innodb.

    modified:
      mysql-test/suite/parts/inc/partition-dml-1-11.inc
 3895 Alexander Nozdrin	2012-06-22 [merge]
      Auto-merge from mysql-trunk.

    modified:
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'mysql-test/suite/parts/inc/partition-dml-1-11.inc'
--- a/mysql-test/suite/parts/inc/partition-dml-1-11.inc	2011-02-17 15:36:05 +0000
+++ b/mysql-test/suite/parts/inc/partition-dml-1-11.inc	2012-06-23 06:10:16 +0000
@@ -115,6 +115,8 @@ disconnect session1;
 disconnect session2;
 connection default;
 DROP TABLE t1, t2;
+--error 0,1
+--rmdir $data_dir_path/test
 --rmdir $data_dir_path
 --rmdir $idx_dir_path
 DROP USER test_user_1;

No bundle (reason: useless for push emails).