From: Marc Alff
Date: September 29 2010 3:29pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3308)
List-Archive: http://lists.mysql.com/commits/119445
Message-Id: <20100929152919.62DBE45E81@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8310670250644422912=="

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

#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-merge/ based on revid:tor.didriksen@stripped

 3308 Marc Alff	2010-09-29
      Merge cleanup

    modified:
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-09 21:15:04 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-29 15:29:14 +0000
@@ -31,6 +31,7 @@ performance_schema_max_table_handles	100
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	1000
+performance_schema_setup_actors_size	100
 show status like "performance_schema%";
 Variable_name	Value
 Performance_schema_cond_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_actors.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2010-09-01 22:59:33 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2010-09-29 15:29:14 +0000
@@ -46,11 +46,11 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	1000000
+performance_schema_max_mutex_instances	10000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	1000000
-performance_schema_max_table_handles	10000
-performance_schema_max_table_instances	1000
+performance_schema_max_rwlock_instances	10000
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	1000
 performance_schema_setup_actors_size	0


--===============8310670250644422912==
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:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   merge/
# testament_sha1: ad5f9239e1eefb04933a98c54bc2f1a0019f78cb
# timestamp: 2010-09-29 09:29:19 -0600
# base_revision_id: tor.didriksen@stripped\
#   2dw2p99ecxiqkjnq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTLStpUAAhJfgEAwUGP/93IC
AAC////wUASW80lsJzknp25ueEkpMBTGmmT0mk/SmwoaaeoA0YJSaBMSbTImVPNUPU9I0AAyASKA
pPU8o0yNoRoaHqMTIaADaop5TammjRoBo0AaBoAASURlNiZJpHhBqMQDUNPKaBM8PyC5dFYPX7Z6
6mg1ObLc6oJIGbRhKD2upFsmXPEkNtNnDatLOM62ZZyIylEi6ODd2yzMt/7u5z5aDCGF15MpkX6v
IKmCNIwLLT6GHZCxxWw1jsr/lnbrsQWWEyh3u2pG0SmvFcsDXa8yImjCS2tsBTYosFRREKvRAaau
eOMDcsYFhaRgTJCikDNNJMSNQPW+pvUqXU/x7Xp7BN4kDj6hJIOms0J8ZPKZOfQdCA19uzNtY2OH
eB8lQNTXH1OY4CTykk+nsiUOhkQ0kbzoY6uRAoNFfm7a+hiTI+9Ui4CaIKei/D0ch3II4yTMge3+
pSUbwXsrJDZFjGlRYTGZwiWuLV3FmYFR401MdNwDYNGYNB46+yhImo0hIgYy/GiJMlO0kTUya0Qr
2VuKZzBLtkSyiN0UcB6jt6TMUdFGG6kEtW+G2YDMs3+JxiyZicmGxdd/WVba4RRpQvEoOO4+lOZo
MMjqciZrGLsqqFeDfa3I2S0CzexccamOHLKVzM5E0MUQHqxiIddTAeUvpxKg/umWDHpLXh9aizW2
C87srVXxVKRB1dFRFaOq2rTnzFhgZSLT7uBs6yiaDkpYMbHxhoNBCruH/XwQdoRwW7yjNFV4KsCj
EREt5bjMLiBjXxN9ViMtaHjqxLoU0VQo5JHO0n0oZRVTWdI0jUlIoErQOW4dtHWWxW6IlCY/9CN3
x9yQHIDEFaRLCPocBo5rCzM99yLWC36Ik3Jol5+Al3VHgqDJMJ90pXkw2jXBVC96Iy2lFopfcCQN
rlh65iB8Drisoj2Sc85zE4V5MQTJa0WIZeGjNQ3j7ZNVDTzLDhlDpa/7gKEYKVdUwUjnboltR7ZQ
qYr4Lx2Dy0eDEYknMQ7N1DAKkhngcNCtUBTX7PM9DSJdNFZyKvICcn8xb031y2DMhfGROtKGaZDX
qNS8LAsY17R5iRQOV+oVmqM9z3XuJhVyKOBpRUes5rsYvGPOIHxVNHut3Q5r0r4Bci5oOICTC7i0
YFTVv/vJI72Z8sWFszWJURijcdjqmQ1SV4XGueQx77aTVKwrMLU9ZVHQMJocomKSZAYkvxWIIYxK
JpnYOTlFtBXpd6yAQFS5UnUSZGkBjJlT8OyTx1jDBCtFyJOYE8L7iXZeBnYq1e+U+jZQniZIMowX
myUZrqrV8wGFK3LyLgNM5RLVWDUoKAaqPJNEsSuik+VkDKhrEFuo2sMFniQRWMu4j+nOY6svTgoi
9Jt3DAJdiOEaIijmTCtgU1hMwDDfyiOLG6NUVFRRBQK8xx06rYMKo0SKjBwGAEAKVNDxITDwpr/x
dyRThQkDLStpUA==


--===============8310670250644422912==--