From: Marc Alff
Date: April 8 2011 12:27am
Subject: bzr commit into mysql-trunk branch (marc.alff:3337)
List-Archive: http://lists.mysql.com/commits/135009
Message-Id: <201104080027.p380RZAw022593@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8103427090582857169=="

--===============8103427090582857169==
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-wl5378/ based on revid:marc.alff@stripped

 3337 Marc Alff	2011-04-08
      Merge cleanup

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2011-04-06 11:13:33 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2011-04-08 00:27:08 +0000
@@ -452,6 +452,8 @@ The following options may be given as th
  Maximum number of opened instrumented files.
  --performance-schema-max-file-instances=# 
  Maximum number of instrumented files.
+ --performance-schema-max-hosts=# 
+ Maximum number of instrumented hosts.
  --performance-schema-max-mutex-classes=# 
  Maximum number of mutex instruments.
  --performance-schema-max-mutex-instances=# 
@@ -472,6 +474,10 @@ The following options may be given as th
  Maximum number of thread instruments.
  --performance-schema-max-thread-instances=# 
  Maximum number of instrumented threads.
+ --performance-schema-max-user-hosts=# 
+ Maximum number of instrumented user@host accounts.
+ --performance-schema-max-users=# 
+ Maximum number of instrumented users.
  --performance-schema-setup-actors-size=# 
  Maximum number of rows in SETUP_ACTORS.
  --performance-schema-setup-objects-size=# 
@@ -912,6 +918,7 @@ performance-schema-max-cond-instances 10
 performance-schema-max-file-classes 50
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances 10000
+performance-schema-max-hosts 100
 performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000000
 performance-schema-max-rwlock-classes 30
@@ -922,6 +929,8 @@ performance-schema-max-table-handles 100
 performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances 1000
+performance-schema-max-user-hosts 100
+performance-schema-max-users 100
 performance-schema-setup-actors-size 100
 performance-schema-setup-objects-size 100
 plugin-load (No default value)

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-04-06 11:13:33 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-04-08 00:27:08 +0000
@@ -452,6 +452,8 @@ The following options may be given as th
  Maximum number of opened instrumented files.
  --performance-schema-max-file-instances=# 
  Maximum number of instrumented files.
+ --performance-schema-max-hosts=# 
+ Maximum number of instrumented hosts.
  --performance-schema-max-mutex-classes=# 
  Maximum number of mutex instruments.
  --performance-schema-max-mutex-instances=# 
@@ -472,6 +474,10 @@ The following options may be given as th
  Maximum number of thread instruments.
  --performance-schema-max-thread-instances=# 
  Maximum number of instrumented threads.
+ --performance-schema-max-user-hosts=# 
+ Maximum number of instrumented user@host accounts.
+ --performance-schema-max-users=# 
+ Maximum number of instrumented users.
  --performance-schema-setup-actors-size=# 
  Maximum number of rows in SETUP_ACTORS.
  --performance-schema-setup-objects-size=# 
@@ -916,6 +922,7 @@ performance-schema-max-cond-instances 10
 performance-schema-max-file-classes 50
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances 10000
+performance-schema-max-hosts 100
 performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000000
 performance-schema-max-rwlock-classes 30
@@ -926,6 +933,8 @@ performance-schema-max-table-handles 100
 performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances 1000
+performance-schema-max-user-hosts 100
+performance-schema-max-users 100
 performance-schema-setup-actors-size 100
 performance-schema-setup-objects-size 100
 plugin-load (No default value)


--===============8103427090582857169==
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-wl5378/
# testament_sha1: 59b4373c8ecd766987a06b5e1346c8fe5bbd4f29
# timestamp: 2011-04-08 02:27:24 +0200
# source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/
# base_revision_id: marc.alff@stripped\
#   fgviz4zkrcuu1ypr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe/RissAAnvfgEAQWGP/93IC
AAC////wUAVeddFAKB110PVdHDUU9EbRpGmm0CMTNTAJo0YBJKDainqflT2SjygNAADQaPUCSU2q
ANANABiGgAABtUUyHqB6j1A0GjJkAAGgJJCaDEEyaAI0E002qM1NqNJ5G4kFA79jE2aWjismK2Ed
t2UL0BaNByZFzPrKh5pkKFQsi8iMMMB3+6+YVm/5E58oooMQFaGGHkaBBrrRRb47YozernP7xVUT
nYXlKJA4UnnmTLypju3qmYQc7LRwrC39jXBRC0LF5GpiMMcz7QUT53XC4wWm7AC3k0IkgJirqzBX
CWIWDG0acCorCvlquw6BaKoYRtinMJ4ERA5e9UQHoTlWcxkuoDARJdrAgFitJkiqFtm8sQan0MYI
kzhx5PPGY4UD4mhcTn54oW8WlCUHyE67OGmWBGREsv+HCNRyxmrjgLvLA2bORxLFeYBaUNfNSvTM
HELmQrizgOFHezRVUhqEAMd8NvDZW4JI2eB9Gv0BdGxmLnYpjmTjEgbMzwLSODlicrMul1LTgbiW
8mnA8uyg7cjeWjgHhKoDqd4YkU4qnQBkrcBwVElIY0oeZ/E7bcV+K4tngHsMTgVFpDfMYtldQqNS
mTjHMYtY0huuGLhx6AZZRGWzHI4ZFyzAqxNzKRYYRgZDG7O6y8JGYw7YXNB2jq1cBC6g8C0iONGe
purzJ1lIlKhpnsfYvsKyQPHDBkx9iowqLXzHgb8sWhgOxN6M7DhjUrIVgztBQRa7ealPQvKGbxgb
yF1/J07ETqClMtBmb9u94Caby8ZDFPw4Jgr651CbZu8vwW0PxsEuWHEGMYIsPcF5ZkswUepb6fVQ
K9JleMCeLz6Hbabblz6h2OXkVMYFBND/jxBZ8B5WzwTHhGHUdjQn63mBtMDgCsO97+WQKLmEvDoJ
YZGGaZLmbDbLwN9NpgEQwdBDHGXqaxoHqB4LoXfPeJoCYAtx0q5kShQ+5GJoekThDvpcnAw5EFSQ
Y5J3rWR1KAqSF5PYrbiI/AQssVWTjMQaElqLzTguF4hs4aPMwXt6j0n/HadY0kiUodD6pxThgzOC
Za2hBToVldF6KCMmJboKB7GID8GGQxEmuxqKuZxCAL6HhIYOheIzKhwMomL6oZ4KQnKzwFh/BtRG
sWudLMkTRqycb+5QCs10befc1Qx5qzQJLNiepAOpEXMmJMejDv5ehaen9nwSE8VxToPFRCmNEF4A
tV/h+kw7nBdgVosRhVXH0B1nGpVCaRJma0hGY4HfAy7FqFBDD3Rm3EeKwE0BwVirgvJYL8aIKQCu
LTGqUE4sacByrHRIhRbVxEk6fmYYHrTqbhhhhi6kPhVuLjzJGhgOQfoDgLgxLamCuglTEI0DxoUI
fDEOAcmWmgZWuiCEEmTHIYf0HDxjuMDhsazcCr1FRhM9iRpQxVKGJjQZkFe4MqyHFARtHE8lsziq
Ux4iB7hi5zxTrNoNXLOR8AXItBhZsJwwVODOuBRbNp2gLxFYK1KwdChIMBhhjsHsBFdjkbkeqr15
jlQ/JQFWbyo3D4CZGSgBz/S0QcE7L3V15Q/xdyRThQkO/RissA==


--===============8103427090582857169==--