bzr push into mysql-5.6 branch (amit.bhattacharya:4851 to 4852)

[Amit Bhattacharya]

 4852 Amit Bhattacharya	2013-01-08
      Modifying the disabled.def file

    modified:
      mysql-test/t/disabled.def
 4851 Sunanda Menon	2013-01-08 [merge]
      Empty version change upmerge

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-12-21 05:41:26 +0000
+++ b/mysql-test/t/disabled.def	2013-01-08 11:03:34 +0000
@@ -17,4 +17,4 @@ log_tables-big           : Bug#11756699
 ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test added by Olav Sandstrvers
 partition_locking_4      : Bug#13924750 2012-04-04 lost connection.
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
-mysql_client_test_embedded : Bug#14722862 2012-10-09 Disabled since this test is failing on all platforms
+mysql_client_test_embedded : Bug#16084066 2013-01-08 Disabled since this test is failing

No bundle (reason: useless for push emails).