From: Marc Alff
Date: October 26 2010 5:35pm
Subject: bzr commit into mysql-5.5-bugteam branch (marc.alff:3099)
List-Archive: http://lists.mysql.com/commits/121953
Message-Id: <201010261735.o9QFDM8x027606@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8563375124339832012=="

--===============8563375124339832012==
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-5.5-bugteam/ based on revid:alexander.nozdrin@stripped

 3099 Marc Alff	2010-10-26
      Fixed test result

    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-08-12 14:08:52 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2010-10-26 17:35:02 +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


--===============8563375124339832012==
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-5.5-bugteam/
# testament_sha1: 561e674fe2375b38b1cc443612f7a12841bd562e
# timestamp: 2010-10-26 19:35:07 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   x72e12800wl136go
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW0lwegAAYxfgAAQUGf/938n
3gD////wUANdeAebFAA1NKeUaMJtQYmQaAAA009IPUAOYACZMACYTBMIYAjAA1NFPaTU9EDTQPUA
AAAAAAip/qp6jymmQzRDTQMEDJoNGEGg0CSQgNEwE000mmhTan6JqHqPCJtNRptRbFpFLDFhlZKS
AvqkRJIHZaMcEF5EAAqepN1W0AwtGO6JmnhsEImX9nmUwlEEEEKuJvKjiyA5AyW69yAr6EjuIu3e
zizWX7SikuUVdPJvA3JFa+qurjJgZSCwZk8TU1pzkJkFaZyrSeJ4jJSkoQcPTEEcIOmrX4gqUzKT
R4eDIO5kDszhsOXbKn2qSWlQlwVM890J1G21RnUHL3l0KRUcu6oW/FUleZgZ5S37iXBL5dyFFVs+
AqWQPR7bMKCAdyoJyOEVGpliVdNc0wn1KKweYSnuRZTdgt44I4ixsMlhL0CZKZioroqtnw0VRo+I
pZSrfGrRxZHhIQky0iKa9ypV6ewpicsLcbITsrs3DljnZrV+VYKEjqWoVJNoK6S6dMumCnLFmEFA
x5rdKeJKyTE0QRoWpsRCJwhDoTicpKIGpBtJhhigSyQTCWFgGwsofge2/PCij0SRmgkI5cHQywRA
p6ELStdFTMzgbww3dM7pmWKTGm31OIqBuiC7aMPdFIQOqEa6lKHHm8+PX0SK/02PDev6A8b5r5fF
fX+buvACFiHLy8Msj02nkfQWXr+Vl8wxQbY+RHzyVDqNKNVueyRqkWXrYWTcDJqPNZF2xeZQvMfE
nXpoNISK7gdSm19UKtH+Vq0QxJeeDcs6CyHdcAvohjcXdQ/TjfJ6CGR+UpPRwo0o+SZbg3WcuPG2
DTAb09P1zu37iB2GcjxFDcXAVGH46udC3uNhqj36123mYNkpnKKeV7Sr9fomk1Mk4tmX3Cl/vjsh
YHEOHs/TsFz+FtLliHxmpE1AUODonSGOC8mQW6om5cxH7C6xOitv+HgM7ToVY+w0ohBQemTcMpIA
yg7l/CdWhmTLT/VIKrVbgUod8D4SOwKF83KvtWF+DMnEJdYNxxW7EUyS3wSW1Ro6HE3LtVCtfskg
EK6+DSR0YozBp1HnMpQYGtjyyYZ7eJBuElN6d1Ke/WJSEQeytuVue+ZHfX32UrAJ1KqU9Pi5VdKY
06L71MTf+LuSKcKEg2kuD0A=


--===============8563375124339832012==--