bzr push into mysql-next-mr-wl4895 branch (marc.alff:3146 to 3147)

[Marc Alff]

 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)


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