mysql · omyshell · Aug 19, 2014 · Aug 19, 2014 · Aug 19, 2014 · Aug 19, 2014
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 250
+performance-schema-max-memory-classes 1024
 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 250
+performance-schema-max-memory-classes 1024
 performance-schema-max-metadata-locks -1
 performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances -1

diff --git a/mysql-test/suite/innodb/include/check_pfs_mem_other_is_zero.inc b/mysql-test/suite/innodb/include/check_pfs_mem_other_is_zero.inc
@@ -0,0 +1,20 @@
+# Check that (after lots of action) the following is still zero. If it is not,
+# then the file that is allocating dynamic memory should be added to the list
+# in ut_new_boot().
+
+-- echo count_alloc WHERE event_name like 'memory/innodb/other'
+
+-- let pfs_enabled = `SELECT COUNT(*) FROM information_schema.engines WHERE support IN ('YES', 'DEFAULT') AND engine = 'PERFORMANCE_SCHEMA'`
+
+-- disable_query_log
+
+if ($pfs_enabled) {
+	SELECT count_alloc FROM performance_schema.memory_summary_global_by_event_name
+	WHERE event_name = 'memory/innodb/other';
+}
+
+if (!$pfs_enabled) {
+	SELECT 0 AS count_alloc;
+}
+
+-- enable_query_log
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
@@ -923,3 +923,7 @@ set global innodb_monitor_disable = default;
 set global innodb_monitor_reset = default;
 set global innodb_monitor_reset_all = default;
 SET GLOBAL INNODB_FILE_PER_TABLE=1;
+SELECT count_alloc FROM performance_schema.memory_summary_global_by_event_name
+WHERE event_name like 'memory/innodb/other';
+count_alloc
+0
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
@@ -3438,3 +3438,6 @@ c1	c2
 9	3
 DROP TABLE t1;
 DROP TABLE t2;
+count_alloc WHERE event_name like 'memory/innodb/other'
+count_alloc
+0
diff --git a/mysql-test/suite/innodb/r/innodb_bug56143.result b/mysql-test/suite/innodb/r/innodb_bug56143.result
@@ -554,3 +554,6 @@ bug56143_2	CREATE TABLE `bug56143_2` (
   CONSTRAINT `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa98` FOREIGN KEY (`a`) REFERENCES `bug56143_1` (`a`) ON UPDATE SET NULL,
   CONSTRAINT `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa99` FOREIGN KEY (`a`) REFERENCES `bug56143_1` (`a`) ON UPDATE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
+count_alloc WHERE event_name like 'memory/innodb/other'
+count_alloc
+0
diff --git a/mysql-test/suite/innodb/r/innodb_misc1.result b/mysql-test/suite/innodb/r/innodb_misc1.result
@@ -815,3 +815,6 @@ Variable_name	Value
 Handler_update	1
 Variable_name	Value
 Handler_delete	1
+count_alloc WHERE event_name like 'memory/innodb/other'
+count_alloc
+0
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test
@@ -1502,3 +1502,4 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot calculate statistics for
 
 eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;
 
+-- source suite/innodb/include/check_pfs_mem_other_is_zero.inc
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
@@ -2697,6 +2697,9 @@ SELECT * FROM t2;
 
 DROP TABLE t1;
 DROP TABLE t2;
+
+-- source suite/innodb/include/check_pfs_mem_other_is_zero.inc
+
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #

diff --git a/mysql-test/suite/innodb/t/innodb_bug56143.test b/mysql-test/suite/innodb/t/innodb_bug56143.test
@@ -584,3 +584,7 @@ SHOW CREATE TABLE bug56143_2;
 -- disable_result_log
 DROP TABLE bug56143_1;
 DROP TABLE bug56143_2;
+
+-- enable_query_log
+-- enable_result_log
+-- source suite/innodb/include/check_pfs_mem_other_is_zero.inc
diff --git a/mysql-test/suite/innodb/t/innodb_misc1.test b/mysql-test/suite/innodb/t/innodb_misc1.test
@@ -1178,3 +1178,6 @@ DISCONNECT c1;
 CONNECTION default;
 
 SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
+
+-- enable_query_log
+-- source suite/innodb/include/check_pfs_mem_other_is_zero.inc
diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
@@ -284,11 +284,11 @@ file_summary_by_event_name	50	0
 file_summary_by_instance	10000	0
 host_cache	279	0
 hosts	100	0
-memory_summary_by_account_by_event_name	25000	0
-memory_summary_by_host_by_event_name	25000	0
-memory_summary_by_thread_by_event_name	50000	0
-memory_summary_by_user_by_event_name	25000	0
-memory_summary_global_by_event_name	250	0
+memory_summary_by_account_by_event_name	102400	0
+memory_summary_by_host_by_event_name	102400	0
+memory_summary_by_thread_by_event_name	204800	0
+memory_summary_by_user_by_event_name	102400	0
+memory_summary_global_by_event_name	1024	0
 metadata_locks	10000	0
 mutex_instances	5000	0
 objects_summary_global_by_type	5500	0
@@ -305,7 +305,7 @@ session_account_connect_attrs	409600	0
 session_connect_attrs	409600	0
 setup_actors	1	0
 setup_consumers	15	0
-setup_instruments	974	0
+setup_instruments	1748	0
 setup_objects	20	0
 setup_timers	5	0
 socket_instances	1000	0

diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result
@@ -114,7 +114,7 @@ performance_schema_max_cond_instances	1000
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000

diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -191,7 +191,7 @@ performance_schema_max_cond_instances	1000
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000

diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -41,7 +41,7 @@ performance_schema_max_cond_instances	1000
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000

diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result
@@ -26,7 +26,7 @@ performance_schema_max_cond_instances	3504
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	7693
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	16510
@@ -242,23 +242,23 @@ performance_schema	(program_hash).count	4
 performance_schema	(program_hash).size	5000
 performance_schema	host_cache.size	336
 performance_schema	(pfs_memory_class).row_size	192
-performance_schema	(pfs_memory_class).row_count	250
-performance_schema	(pfs_memory_class).memory	48000
+performance_schema	(pfs_memory_class).row_count	1024
+performance_schema	(pfs_memory_class).memory	196608
 performance_schema	memory_summary_by_thread_by_event_name.row_size	72
-performance_schema	memory_summary_by_thread_by_event_name.row_count	100500
-performance_schema	memory_summary_by_thread_by_event_name.memory	7236000
+performance_schema	memory_summary_by_thread_by_event_name.row_count	411648
+performance_schema	memory_summary_by_thread_by_event_name.memory	29638656
 performance_schema	memory_summary_global_by_event_name.row_size	72
-performance_schema	memory_summary_global_by_event_name.row_count	250
-performance_schema	memory_summary_global_by_event_name.memory	18000
+performance_schema	memory_summary_global_by_event_name.row_count	1024
+performance_schema	memory_summary_global_by_event_name.memory	73728
 performance_schema	memory_summary_by_account_by_event_name.row_size	72
-performance_schema	memory_summary_by_account_by_event_name.row_count	25000
-performance_schema	memory_summary_by_account_by_event_name.memory	1800000
+performance_schema	memory_summary_by_account_by_event_name.row_count	102400
+performance_schema	memory_summary_by_account_by_event_name.memory	7372800
 performance_schema	memory_summary_by_user_by_event_name.row_size	72
-performance_schema	memory_summary_by_user_by_event_name.row_count	25000
-performance_schema	memory_summary_by_user_by_event_name.memory	1800000
+performance_schema	memory_summary_by_user_by_event_name.row_count	102400
+performance_schema	memory_summary_by_user_by_event_name.memory	7372800
 performance_schema	memory_summary_by_host_by_event_name.row_size	72
-performance_schema	memory_summary_by_host_by_event_name.row_count	25000
-performance_schema	memory_summary_by_host_by_event_name.memory	1800000
+performance_schema	memory_summary_by_host_by_event_name.row_count	102400
+performance_schema	memory_summary_by_host_by_event_name.memory	7372800
 performance_schema	metadata_locks.row_size	512
 performance_schema	metadata_locks.row_count	10000
 performance_schema	metadata_locks.memory	5120000
@@ -280,17 +280,17 @@ performance_schema	events_transactions_summary_by_user_by_event_name.memory	8800
 performance_schema	events_transactions_summary_by_host_by_event_name.size	88
 performance_schema	events_transactions_summary_by_host_by_event_name.count	100
 performance_schema	events_transactions_summary_by_host_by_event_name.memory	8800
-performance_schema	performance_schema.memory	521446696
+performance_schema	performance_schema.memory	560772088
 select * from performance_schema.memory_summary_global_by_event_name
 where event_name='memory/performance_schema/internal_buffers';
 EVENT_NAME	memory/performance_schema/internal_buffers
 COUNT_ALLOC	60
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	521446696
+SUM_NUMBER_OF_BYTES_ALLOC	560772088
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	60
 CURRENT_COUNT_USED	60
 HIGH_COUNT_USED	60
-LOW_NUMBER_OF_BYTES_USED	521446696
-CURRENT_NUMBER_OF_BYTES_USED	521446696
-HIGH_NUMBER_OF_BYTES_USED	521446696
+LOW_NUMBER_OF_BYTES_USED	560772088
+CURRENT_NUMBER_OF_BYTES_USED	560772088
+HIGH_NUMBER_OF_BYTES_USED	560772088
diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result
@@ -26,7 +26,7 @@ performance_schema_max_cond_instances	10900
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	23385
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	53000
@@ -242,23 +242,23 @@ performance_schema	(program_hash).count	4
 performance_schema	(program_hash).size	5000
 performance_schema	host_cache.size	336
 performance_schema	(pfs_memory_class).row_size	192
-performance_schema	(pfs_memory_class).row_count	250
-performance_schema	(pfs_memory_class).memory	48000
+performance_schema	(pfs_memory_class).row_count	1024
+performance_schema	(pfs_memory_class).memory	196608
 performance_schema	memory_summary_by_thread_by_event_name.row_size	72
-performance_schema	memory_summary_by_thread_by_event_name.row_count	125000
-performance_schema	memory_summary_by_thread_by_event_name.memory	9000000
+performance_schema	memory_summary_by_thread_by_event_name.row_count	512000
+performance_schema	memory_summary_by_thread_by_event_name.memory	36864000
 performance_schema	memory_summary_global_by_event_name.row_size	72
-performance_schema	memory_summary_global_by_event_name.row_count	250
-performance_schema	memory_summary_global_by_event_name.memory	18000
+performance_schema	memory_summary_global_by_event_name.row_count	1024
+performance_schema	memory_summary_global_by_event_name.memory	73728
 performance_schema	memory_summary_by_account_by_event_name.row_size	72
-performance_schema	memory_summary_by_account_by_event_name.row_count	25000
-performance_schema	memory_summary_by_account_by_event_name.memory	1800000
+performance_schema	memory_summary_by_account_by_event_name.row_count	102400
+performance_schema	memory_summary_by_account_by_event_name.memory	7372800
 performance_schema	memory_summary_by_user_by_event_name.row_size	72
-performance_schema	memory_summary_by_user_by_event_name.row_count	25000
-performance_schema	memory_summary_by_user_by_event_name.memory	1800000
+performance_schema	memory_summary_by_user_by_event_name.row_count	102400
+performance_schema	memory_summary_by_user_by_event_name.memory	7372800
 performance_schema	memory_summary_by_host_by_event_name.row_size	72
-performance_schema	memory_summary_by_host_by_event_name.row_count	25000
-performance_schema	memory_summary_by_host_by_event_name.memory	1800000
+performance_schema	memory_summary_by_host_by_event_name.row_count	102400
+performance_schema	memory_summary_by_host_by_event_name.memory	7372800
 performance_schema	metadata_locks.row_size	512
 performance_schema	metadata_locks.row_count	10000
 performance_schema	metadata_locks.memory	5120000
@@ -280,17 +280,17 @@ performance_schema	events_transactions_summary_by_user_by_event_name.memory	8800
 performance_schema	events_transactions_summary_by_host_by_event_name.size	88
 performance_schema	events_transactions_summary_by_host_by_event_name.count	100
 performance_schema	events_transactions_summary_by_host_by_event_name.memory	8800
-performance_schema	performance_schema.memory	526418664
+performance_schema	performance_schema.memory	571205400
 select * from performance_schema.memory_summary_global_by_event_name
 where event_name='memory/performance_schema/internal_buffers';
 EVENT_NAME	memory/performance_schema/internal_buffers
 COUNT_ALLOC	60
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	526418664
+SUM_NUMBER_OF_BYTES_ALLOC	571205400
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	60
 CURRENT_COUNT_USED	60
 HIGH_COUNT_USED	60
-LOW_NUMBER_OF_BYTES_USED	526418664
-CURRENT_NUMBER_OF_BYTES_USED	526418664
-HIGH_NUMBER_OF_BYTES_USED	526418664
+LOW_NUMBER_OF_BYTES_USED	571205400
+CURRENT_NUMBER_OF_BYTES_USED	571205400
+HIGH_NUMBER_OF_BYTES_USED	571205400
diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result
@@ -26,7 +26,7 @@ performance_schema_max_cond_instances	612
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	1556
-performance_schema_max_memory_classes	250
+performance_schema_max_memory_classes	1024
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	3056
@@ -242,23 +242,23 @@ performance_schema	(program_hash).count	4
 performance_schema	(program_hash).size	5000
 performance_schema	host_cache.size	336
 performance_schema	(pfs_memory_class).row_size	192
-performance_schema	(pfs_memory_class).row_count	250
-performance_schema	(pfs_memory_class).memory	48000
+performance_schema	(pfs_memory_class).row_count	1024
+performance_schema	(pfs_memory_class).memory	196608
 performance_schema	memory_summary_by_thread_by_event_name.row_size	72
-performance_schema	memory_summary_by_thread_by_event_name.row_count	28000
-performance_schema	memory_summary_by_thread_by_event_name.memory	2016000
+performance_schema	memory_summary_by_thread_by_event_name.row_count	114688
+performance_schema	memory_summary_by_thread_by_event_name.memory	8257536
 performance_schema	memory_summary_global_by_event_name.row_size	72
-performance_schema	memory_summary_global_by_event_name.row_count	250
-performance_schema	memory_summary_global_by_event_name.memory	18000
+performance_schema	memory_summary_global_by_event_name.row_count	1024
+performance_schema	memory_summary_global_by_event_name.memory	73728
 performance_schema	memory_summary_by_account_by_event_name.row_size	72
-performance_schema	memory_summary_by_account_by_event_name.row_count	2500
-performance_schema	memory_summary_by_account_by_event_name.memory	180000
+performance_schema	memory_summary_by_account_by_event_name.row_count	10240
+performance_schema	memory_summary_by_account_by_event_name.memory	737280
 performance_schema	memory_summary_by_user_by_event_name.row_size	72
-performance_schema	memory_summary_by_user_by_event_name.row_count	1250
-performance_schema	memory_summary_by_user_by_event_name.memory	90000
+performance_schema	memory_summary_by_user_by_event_name.row_count	5120
+performance_schema	memory_summary_by_user_by_event_name.memory	368640
 performance_schema	memory_summary_by_host_by_event_name.row_size	72
-performance_schema	memory_summary_by_host_by_event_name.row_count	5000
-performance_schema	memory_summary_by_host_by_event_name.memory	360000
+performance_schema	memory_summary_by_host_by_event_name.row_count	20480
+performance_schema	memory_summary_by_host_by_event_name.memory	1474560
 performance_schema	metadata_locks.row_size	512
 performance_schema	metadata_locks.row_count	10000
 performance_schema	metadata_locks.memory	5120000
@@ -280,17 +280,17 @@ performance_schema	events_transactions_summary_by_user_by_event_name.memory	440
 performance_schema	events_transactions_summary_by_host_by_event_name.size	88
 performance_schema	events_transactions_summary_by_host_by_event_name.count	20
 performance_schema	events_transactions_summary_by_host_by_event_name.memory	1760
-performance_schema	performance_schema.memory	69654568
+performance_schema	performance_schema.memory	78050920
 select * from performance_schema.memory_summary_global_by_event_name
 where event_name='memory/performance_schema/internal_buffers';
 EVENT_NAME	memory/performance_schema/internal_buffers
 COUNT_ALLOC	60
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	69654568
+SUM_NUMBER_OF_BYTES_ALLOC	78050920
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	60
 CURRENT_COUNT_USED	60
 HIGH_COUNT_USED	60
-LOW_NUMBER_OF_BYTES_USED	69654568
-CURRENT_NUMBER_OF_BYTES_USED	69654568
-HIGH_NUMBER_OF_BYTES_USED	69654568
+LOW_NUMBER_OF_BYTES_USED	78050920
+CURRENT_NUMBER_OF_BYTES_USED	78050920
+HIGH_NUMBER_OF_BYTES_USED	78050920
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1502,3 +1502,4 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot calculate statistics for

		eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;

		-- source suite/innodb/include/check_pfs_mem_other_is_zero.inc