From: Marc Alff
Date: November 9 2010 3:34pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3342)
List-Archive: http://lists.mysql.com/commits/123299
Message-Id: <201011091534.oA9FYNP6003088@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1991015779846512815=="

--===============1991015779846512815==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:bjorn.munch@stripped

 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
=== 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


--===============1991015779846512815==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: f2281baa1bd5ea702f7efeeb081024f7b3d1cbf4
# timestamp: 2010-11-09 16:34:03 +0100
# source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/
# base_revision_id: bjorn.munch@stripped\
#   1nldio3yfpphhx6h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSpS8A0AAXrfgAAQUHf/938n
3gD////wUAO140ruapADw0QQ0ATJgU0HpGQDTT1PKeSaeoNA0k1PJknoam2ogBGgyYmRhNMmmjAN
TVP0amoANNANAAGQ0yAAAc0xMBGmBGEYAAAAmEYCSJNDIIyaGSaHqTNRojagPUBvVA2p8zWvFG+G
8Gc6DKdbiAoNSaqmJjbEF0fDUIQJdouclRoSakomF7megbhUExT34RZclBWCPd6YtL7bjv0sjYtI
ebenpllvu3+Y7Cjfl782z8I+Vqes6iOC3Gt8evR3+kRVQJrTKOwCCRNc1ueVD9KBZMy8vJCcRYmd
WquEVmVtxKBEEyet7VUKamyo7aUL5elAjE16fGpChRtpJTFvwzTF4FK8kRlylUCaGHCun2sYVUwQ
GhkggH0RHmLDAVlnGKFUrNyYvfvyIjFFWEKiIfBcyWZZFQTLc5vJyFv602iy2Pep2aMFeKzgq2tT
aEBqRxzZYZKpg+JKjpKprgURJesE9QN9DlsKxOuoV5At0pJwB31WNExXYmNWGFu25TcyHeXbslO6
qycBi+dEI2xUq0BwOpUIyVcINDUYtqxQMLdmIZqWjBOaTEDhgmEomzWFgNNn4ie2VnTIEnN59k/W
RkWOD7BAYMYZKGK8cePBzwz3kvMuK74Cz0JzgY/HJAlWhggys1aSG3KtQpfmFgFpNBKHiezQPX1S
HLi6AXC/ID1u2lEYVXa3gfW5Drcjv3i67tFy/SGHaAj2HIuoCW8wA2L7+gUFcxQjrAsd1IsgyR/3
ckY5rvUmxl6+BVZUqVnmQoTCu5nFUJftQn4qpmUAWOIJTVaJYmG6Nmuug9iIXwKqRBJrUt2OlMrh
vUA7Tf+0BohwhG0jKmaVqMqbLErNwiiSSaKuYSI4c9QtbjS4DnBznSwF5/vZ8OZzWMFf1WL0GWqG
PeeexGgNmHAk0EQ0Xp2LFUGtpfb/C3CenvNE5vXgFnkQ68soyW8MKl4hp9Lynu8PZea7PjmPWoZh
X7LsDUVoUQCMl4zSGPzrQe7g3AUHU7kixHH+zzGfl4KRy1I7DbytqiU+irIeRK9hyuxM7FJLampD
iKNNlCak+ahNDMpOtPH7lBXRbAFAPnAq9kisHVaugr57uj7mZbKCNSzE01hVPuXyFwk0+W9UJLWI
iFzo0VnbgUhrIV84YchU00jLQHwls7WerK8m1swaa7slWqQZNjvvy1YbOLudgovZtVXuXGEt8rSi
YWK1sSl1jBYcSjKtaKsfO62pZBJdF9l63RCy/VOfiu4W1b5FfAu5IpwoSBUpeAaA


--===============1991015779846512815==--