bzr commit into mysql-trunk branch (marc.alff:3337)

[Marc Alff]

#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)


Attachment: [text/bzr-bundle] bzr/[e-mail]