From: Marc Alff
Date: May 11 2010 8:05am
Subject: bzr push into mysql-next-mr-wl4895 branch (marc.alff:3146 to 3147)
List-Archive: http://lists.mysql.com/commits/107919
Message-Id: <20100511080511.12D10589A42@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_3DaXPV08WDnv/mwqLI+J4Q)"

--Boundary_(ID_3DaXPV08WDnv/mwqLI+J4Q)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3147 Marc Alff	2010-05-11
      Fixed test output

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
 3146 Marc Alff	2010-05-07
      WL#4895 PERFORMANCE SCHEMA TABLE IO
      
      Port, continued

    modified:
      sql/lock.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-03-24 15:03:44 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-05-11 08:04:45 +0000
@@ -863,8 +863,8 @@ performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000
 performance-schema-max-rwlock-classes 20
 performance-schema-max-rwlock-instances 1000
-performance-schema-max-table-handles 100000
-performance-schema-max-table-instances 50000
+performance-schema-max-table-handles 10000
+performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances 1000
 plugin-load (No default value)

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2010-03-24 20:29:38 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-05-11 08:04:45 +0000
@@ -867,8 +867,8 @@ performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000
 performance-schema-max-rwlock-classes 20
 performance-schema-max-rwlock-instances 1000
-performance-schema-max-table-handles 100000
-performance-schema-max-table-instances 50000
+performance-schema-max-table-handles 10000
+performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances 1000
 plugin-load (No default value)


--Boundary_(ID_3DaXPV08WDnv/mwqLI+J4Q)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4895/
# testament_sha1: 7c73a339ba19d2958ae8ca5cee7eaeb783fb4e70
# timestamp: 2010-05-11 02:05:11 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   t85cmthfnij7khbs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQbZihAAAh/fgEAQUWP//3MC
AAC////wUATd3e5aAyoKqKVcYAAAAAaDQBoBoBomk1DT0ZJ6QPUZAAAAANT0Sh6hkBiGTQAMCDQA
SKCammhkZE0xGQyJ6aTTTQNqBVJGpiZMIGgU8k9CanpqG1GJ6mjGs15rInvxLic1ncWq3pnbfKaR
QccKnZMyk/Oy5cRcBBJNc9jbdgBSS0zI1WqQpc6cferwiKkP+UAcYkMFB9GeK3iUOHFcodyVo1gB
VMEIi75QxgmHq4Z4wrhG2vdsxeaTWKdhpvfj7/mwuj9FPPNJqo4ipuGkbiBQZ2Jxke2YYYkZ6CIa
yEEb2oh4sSaAY6EpGWshcBUQSPWaxAcSFUwsU7ji8FzyvczI8lDJemXsZRCa8a8h7vOssCuRz61W
xaQjDSpneTEuzEgi0UB4NGksRK+BATtSbkFGtkuJyak1Hy3xU1Jwk+bk4v8a2mzTuac7k4ojWyV1
8nJWmqZMFbmtVb7LtRx70KLm+oUKhnNtE03T51t0WxJVG77bE017u3j4zb7WI334RVIYanNk2Kyh
rct2qmprcmEW0t1S7RpaXFTnXoaU2Ut6PgbSl+lw1YM6lTTHtNy3sPDcnRiXp9oxvx0yi8baFNKx
tptUz9I1QzST0WTaJqXyFibX6NC2m+mKSwv12uvWlnUvcy40lRZkdB4ssxrMEpqSJ3LoYNL2Zv4s
yVD5ONuoZAaMPyc/SEZxKnCPiC+jukZhjb/jupWplqSJKLfSm+UcPUlNGTyHVQ/6s6uHAjmx5ubI
mjedAXTBZLwZVoXr9TBWgNZBhy4+Q9BebM+3yeTkrYmFmUdkbOCRFS5sb7ni81Ji+1Ecv51F1MiJ
Wx0RHn4OyR83BQybdDo4tgyNio9VO5kJNb+hLE5xcrfia+R2JIitinn2ZJlbW8avP3Wr/o84m2rt
NGMTh3v98HdubY8a0JPaJIkOuWHE8mdBgydGvcsiWpFkoOytnVDcU06t67zWoEgWokRIrGhWr4OB
4LvJ7Frz3hUvPl2E3hEVWvz4PTry4fSnqi9RTGFLuTOsWt5RQyW9nUCZiWma7UpGr4C1GTMf3bGr
QguQcOsTu+S9cs2EHrGcOo9er91Fu+85sxNGD2MCKIaHc6sFR9OJzFAXKw1Wbz2EnQPIP97+Z+yA
MkrQtUfK84ZJ1qmVaf1kLG3Mx13kAh8DS4rvypTQyVIxhem9pIwQ2JrwJYZ0lJBziiZ1Bc0US5UR
f7ZUuiO8c5xw6dCzRH1LTDVy06UqF96t+d4xe40GHbb9ipYkBvmhSYHoK3RpM7Ua0qVpXQ0BIkxp
hZtPkjQbuKHcFDXU1jW5AzEHBbDsgrRQrh9FKOqnPDm0SPfGLI8Z9bFzSsLCiPaNuusYPctfgSMS
Ma0GWCmw00iVHPtPGKDObKKuPcY/x4uzlBtq+u/jqSjU0LyxqaH3bpviSN91BEMmBgD4S+5mdXQw
D+LuSKcKEgDbMUIA


--Boundary_(ID_3DaXPV08WDnv/mwqLI+J4Q)--