From: Nirbhay Choubey
Date: August 31 2012 6:48am
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:4391 to 4392)
List-Archive: http://lists.mysql.com/commits/144668
Message-Id: <20120831064851.30440.43960.4392@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4392 Nirbhay Choubey	2012-08-31 [merge]
      Local merge.

    modified:
      mysql-test/t/mysql_config_editor.test
 4391 kevin.lewis@stripped	2012-08-30 [merge]
      Merge Bug#14558324 from mysql-5.6

    modified:
      storage/innobase/os/os0file.cc
=== modified file 'mysql-test/t/mysql_config_editor.test'
--- a/mysql-test/t/mysql_config_editor.test	2012-07-13 14:29:59 +0000
+++ b/mysql-test/t/mysql_config_editor.test	2012-08-31 06:48:04 +0000
@@ -178,7 +178,7 @@ DROP USER test_user1, test_user2;
 --echo # The 'invalid' login file should not cause
 --echo # any problem.
 --echo #
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2>&1
+--exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2> /dev/null
 
 --echo ###############################
 --echo # Dropping the test login file

No bundle (reason: useless for push emails).