From: Marc Alff
Date: November 9 2010 10:36am
Subject: bzr commit into mysql-next-mr branch (marc.alff:3374)
List-Archive: http://lists.mysql.com/commits/123209
Message-Id: <201011091037.oA84Usni014406@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8396259029452181940=="

--===============8396259029452181940==
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-next-mr-bugfixing-merge/ based on revid:ramil@stripped

 3374 Marc Alff	2010-11-09
      Fixed broken merge

    modified:
      storage/perfschema/table_threads.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 */


--===============8396259029452181940==
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-next-mr-bugfixing-\
#   merge/
# testament_sha1: db8a450a3d324dc3cab5da2a9122cd05da0a0dd5
# timestamp: 2010-11-09 11:36:46 +0100
# source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: ramil@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTEj0oQAAXtfgAAQUGf/93vn
HIC////6UANT3O7Uzl03S7CUhGpPammhpPJpPCDJGjTTINANkgGiapshk1T08SGFAaaABkPUDQGg
khCZU8mQp6aGp+pM1BoABghpiA5gAJkwAJhMEwhgCMACSSU9M1NGjU/UaaT1PUyaZBmk0AABohmD
MSyviZQclAArXSkUVI6H9c5gzx2F8ZFgzMUhWtn9r2Y/qOq2mQtsfFz0zy+dJIZDDvat25uJjaCE
RqKHDKv1b496R7JUteApVciZKE0sWS/GJ43K4WZi90pzCGEOzyE4iBhijRyyQOpJ1Sbu5S4WZ0MX
JTu5HTjf4aGQe6qvEyog1Gj03SGQXjaJ0nA/FTj8ClH7YNlRf6hxt2Q6GkP8xILZHQ4RJ0EdO9km
ic1Lel77gsC+3MPzeBMJxKIxfTEozNUHyUCYIQFQrTC2bKEn/gpql6KbRzNZ+SZgZkVNbTZjWbtd
HY0hA2GRZNaGLNgXgK51RdMCWHx0G15QE4bl5aZpTIE0sKC1k6jDG8fF24ynQp0plaKyhuDUYi3Z
ZaMucW2aDK1iFgcJk/qFwRLF2taMLEofKuM2pQwgndCZSXltGhearcaJcUGvGMVo4TRpQA6/0IpS
uLGfNXfbyu5vwWteXzXdyulmwoedbBiSsCQw0lLbNkCZzx3gNQ2kTA2gbqIk9ur8gBMhl1wwbk43
kH7RlTpk1BPi1sOAY2Epa6MLTIsJ2HbVl4pnMBIkUVlFElPIPuqNYlxm99JSKc4LB703iDvVUhEu
ZVeiTV0i3OBSMsqDjY6eccNRpu0QRhu+lCr0eNRGWmUbrBwKtQMArWSPtuFgwCilTBbDLJOgYC7P
rozY2GrIpmJBhZn0iKmC8vKhmpiRhgcQ17kU/SPJQkyPEecL9f1ljeyBpCyH9wVDbGqNWMLRZlnF
k9grB4XpogkCYBjWt+hBi0S7FqEcia/i/J+hn3b1h5t89RJZ3vInvH/qu0XBasgiVw2pPMJKiNky
yaETs1QLgDVETgaQkWxynnM8OGDMnFNyXLHfu2BS+EExdBSqy4g5wZEVmAkDz1WFoynMN4Ux2TvW
y3EDcNSzfsKlUafLzbYiDj5mrSmQ4q11lTHB4aBUUTyGVHMCuBS0Z6LxOWYBoK/dxlhLcBjUoURD
EwbCoWOMfJC/Uf4u5IpwoSBiR6UI


--===============8396259029452181940==--