From: Nisha Gopalakrishnan
Date: July 16 2012 6:50am
Subject: bzr push into mysql-trunk branch (nisha.gopalakrishnan:4056 to 4057)
List-Archive: http://lists.mysql.com/commits/144451
Message-Id: <201207160650.q6G6oROO006438@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4057 Nisha Gopalakrishnan	2012-07-16
      (no message)

    modified:
      internal/mysql-test/suite/i_main/t/kill.test
      sql/sql_help.cc
 4056 Nirbhay Choubey	2012-07-13 [merge]
      Null merge.

=== modified file 'internal/mysql-test/suite/i_main/t/kill.test'
--- a/internal/mysql-test/suite/i_main/t/kill.test	2012-07-12 10:28:36 +0000
+++ b/internal/mysql-test/suite/i_main/t/kill.test	2012-07-16 06:49:24 +0000
@@ -87,6 +87,7 @@ connection default;
 DROP FUNCTION f1_bug11752226;
 SET DEBUG_SYNC= 'RESET';
 
+
 --echo #
 --echo #BUG 14221840: KILLING HELP COMMAND: ASSERTION FAILED: ! IS_SET(),
 --echo #              FILE SQL_ERROR.CC, LINE 465 

=== modified file 'sql/sql_help.cc'
--- a/sql/sql_help.cc	2012-07-12 10:28:36 +0000
+++ b/sql/sql_help.cc	2012-07-16 06:49:24 +0000
@@ -750,6 +750,7 @@ bool mysqld_help(THD *thd, const char *m
                                   &error)))
       goto error;
 
+
     DEBUG_SYNC(thd, "before_help_record_read");
 
     count_categories= search_categories(thd, tables[1].table, used_fields,

No bundle (reason: useless for push emails).