From: Nirbhay Choubey
Date: August 31 2012 6:48am
Subject: bzr push into mysql-5.6 branch (nirbhay.choubey:4203 to 4204) Bug#14513708
List-Archive: http://lists.mysql.com/commits/144667
X-Bug: 14513708
Message-Id: <20120831064855.30445.94827.4204@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4204 Nirbhay Choubey	2012-08-31
      Bug#14513708 : postfix for an affected test.

    modified:
      mysql-test/t/mysql_config_editor.test
 4203 kevin.lewis@stripped	2012-08-30
      Bug#14558324 - INNODB ASSERTION ERROR WHEN UNKNOWN OPTION ENCOUNTERED
      
      Current directory was not set to a valid folder so Windows returned
      ERROR_ACCESS_DENIED for os_file_create().  5.6 code had been changed to
      report the call stack as an assert instead of just exit(1); when an unknown
      error is returned from the OS.  So this patch uses exit(1) for non-debug builds
      and an assert for debug builds.

    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:28:34 +0000
+++ b/mysql-test/t/mysql_config_editor.test	2012-08-31 06:46:44 +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).