From: Marc Alff
Date: November 9 2010 10:37am
Subject: bzr push into mysql-next-mr branch (marc.alff:3373 to 3374)
List-Archive: http://lists.mysql.com/commits/123210
Message-Id: <201011091037.oA8Gw0kH016966@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3374 Marc Alff	2010-11-09
      Fixed broken merge

    modified:
      storage/perfschema/table_threads.cc
 3373 Ramil Kalimullin	2010-11-09
      Post-merge fix.
      
      "bind-address" option (duplicated) declaration removed from sql/mysqld.cc.

    modified:
      sql/mysqld.cc
=== modified file 'storage/perfschema/table_threads.cc'
--- a/storage/perfschema/table_threads.cc	2010-10-07 21:16:41 +0000
+++ b/storage/perfschema/table_threads.cc	2010-11-09 10:36:41 +0000
@@ -103,7 +103,7 @@ table_threads::m_field_def=
 PFS_engine_table_share
 table_threads::m_share=
 {
-  { C_STRING_WITH_LEN("THREADS") },
+  { C_STRING_WITH_LEN("threads") },
   &pfs_updatable_acl,
   &table_threads::create,
   NULL, /* write_row */

No bundle (reason: useless for push emails).