From: Marc Alff
Date: November 9 2010 3:34pm
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3341 to 3342)
List-Archive: http://lists.mysql.com/commits/123301
Message-Id: <201011091535.oA8ERCvK016814@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3342 Marc Alff	2010-11-09
      Fixed broken merge in mysql-trunk-bugfixing
      
      This CSET is to be null-merged in mysql-next-mr,
      the test output for schema is named schema_lc*, and is already ok there.

    modified:
      mysql-test/suite/perfschema/r/schema.result
 3341 Bjorn Munch	2010-11-09 [merge]
      mtr: ignore SERVER_UUID change in check-testcase

    modified:
      mysql-test/include/mtr_check.sql
=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2010-11-08 19:35:17 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2010-11-09 15:33:57 +0000
@@ -195,6 +195,6 @@ show create table threads;
 Table	Create Table
 threads	CREATE TABLE `threads` (
   `THREAD_ID` int(11) NOT NULL,
-  `ID` int(11) NOT NULL,
-  `NAME` varchar(64) NOT NULL
+  `PROCESSLIST_ID` int(11) DEFAULT NULL,
+  `NAME` varchar(128) NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

No bundle (reason: useless for push emails).