Merge mysql-trunk --> mysql-trunk-wl7445

aostar · Aug 19, 2014 · 4b2142b · 4b2142b
2 parents 5c6febe + 097834b
commit 4b2142b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
@@ -1278,7 +1278,7 @@ performance-schema-max-cond-instances -1
 performance-schema-max-file-classes 50
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances -1
-performance-schema-max-memory-classes 1024
+performance-schema-max-memory-classes 320
 performance-schema-max-metadata-locks -1
 performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances -1

diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
@@ -1286,7 +1286,7 @@ performance-schema-max-cond-instances -1
 performance-schema-max-file-classes 50
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances -1
-performance-schema-max-memory-classes 1024
+performance-schema-max-memory-classes 320
 performance-schema-max-metadata-locks -1
 performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances -1