From: Marc Alff Date: June 7 2012 3:38pm Subject: bzr push into mysql-trunk branch (marc.alff:3964 to 3965) List-Archive: http://lists.mysql.com/commits/144144 Message-Id: <201206071538.q57FcidF008381@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3965 Marc Alff 2012-06-07 Improved the test robustness of performance_schema.sizing_growth, adjusted mutex_per_share heuristic modified: mysql-test/suite/perfschema/r/sizing_default.result mysql-test/suite/perfschema/r/sizing_growth.result mysql-test/suite/perfschema/r/sizing_high.result mysql-test/suite/perfschema/r/sizing_low.result mysql-test/suite/perfschema/r/sizing_med.result mysql-test/suite/perfschema/t/sizing_growth.test storage/perfschema/pfs_autosize.cc 3964 Narayanan Venkateswaran 2012-06-07 [merge] WL#6161 Integrating with InnoDB codebase in MySQL 5.5 Merging forward changes from mysql-5.5 modified: storage/innobase/btr/btr0btr.cc storage/innobase/ha/ha0ha.cc storage/innobase/include/btr0btr.h storage/innobase/include/btr0types.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/dict0dict.h storage/innobase/include/trx0sys.h storage/innobase/trx/trx0sys.cc === modified file 'mysql-test/suite/perfschema/r/sizing_default.result' --- a/mysql-test/suite/perfschema/r/sizing_default.result 2012-06-01 08:39:34 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_default.result 2012-06-07 15:37:49 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1138 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 2393 +performance_schema_max_mutex_instances 2837 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1724 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 192 -performance_schema mutex_instances.row_count 2393 -performance_schema mutex_instances.memory 459456 +performance_schema mutex_instances.row_count 2837 +performance_schema mutex_instances.memory 544704 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 1724 performance_schema rwlock_instances.memory 331008 @@ -223,4 +223,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 445 performance_schema (user_hash).count 2 performance_schema (user_hash).size 5 -performance_schema performance_schema.memory 35301472 +performance_schema performance_schema.memory 35386720 === modified file 'mysql-test/suite/perfschema/r/sizing_growth.result' --- a/mysql-test/suite/perfschema/r/sizing_growth.result 2012-06-06 14:19:43 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_growth.result 2012-06-07 15:37:49 +0000 @@ -178,9 +178,9 @@ drop table test.t7; drop table test.t8; drop table test.t9; drop table test.t10; -select @mutex_per_share; -@mutex_per_share -3 +select @mutex_per_share <= 4; +@mutex_per_share <= 4 +1 select @rwlock_per_share; @rwlock_per_share 1 @@ -215,7 +215,7 @@ select @file_per_handle; @file_per_handle 0 select if( -(@mutex_per_share = 3) +(@mutex_per_share <= 4) AND (@rwlock_per_share = 1) AND (@cond_per_share = 0) AND (@file_per_share <= 2) === modified file 'mysql-test/suite/perfschema/r/sizing_high.result' --- a/mysql-test/suite/perfschema/r/sizing_high.result 2012-06-01 08:39:34 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_high.result 2012-06-07 15:37:49 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 15693 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 32200 +performance_schema_max_mutex_instances 42200 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 30800 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 192 -performance_schema mutex_instances.row_count 32200 -performance_schema mutex_instances.memory 6182400 +performance_schema mutex_instances.row_count 42200 +performance_schema mutex_instances.memory 8102400 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 30800 performance_schema rwlock_instances.memory 5913600 @@ -223,4 +223,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 12500 performance_schema (user_hash).count 2 performance_schema (user_hash).size 100 -performance_schema performance_schema.memory 414532568 +performance_schema performance_schema.memory 416452568 === modified file 'mysql-test/suite/perfschema/r/sizing_low.result' --- a/mysql-test/suite/perfschema/r/sizing_low.result 2012-06-01 08:39:34 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_low.result 2012-06-07 15:37:49 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1138 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 2056 +performance_schema_max_mutex_instances 2500 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 1612 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 192 -performance_schema mutex_instances.row_count 2056 -performance_schema mutex_instances.memory 394752 +performance_schema mutex_instances.row_count 2500 +performance_schema mutex_instances.memory 480000 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 1612 performance_schema rwlock_instances.memory 309504 @@ -223,4 +223,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 445 performance_schema (user_hash).count 2 performance_schema (user_hash).size 5 -performance_schema performance_schema.memory 24246496 +performance_schema performance_schema.memory 24331744 === modified file 'mysql-test/suite/perfschema/r/sizing_med.result' --- a/mysql-test/suite/perfschema/r/sizing_med.result 2012-06-01 08:39:34 +0000 +++ b/mysql-test/suite/perfschema/r/sizing_med.result 2012-06-07 15:37:49 +0000 @@ -25,7 +25,7 @@ performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1280 performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 3085 +performance_schema_max_mutex_instances 3658 performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_instances 2222 performance_schema_max_socket_classes 10 @@ -91,8 +91,8 @@ performance_schema (pfs_file_class).row_ performance_schema (pfs_file_class).row_count 50 performance_schema (pfs_file_class).memory 16000 performance_schema mutex_instances.row_size 192 -performance_schema mutex_instances.row_count 3085 -performance_schema mutex_instances.memory 592320 +performance_schema mutex_instances.row_count 3658 +performance_schema mutex_instances.memory 702336 performance_schema rwlock_instances.row_size 192 performance_schema rwlock_instances.row_count 2222 performance_schema rwlock_instances.memory 426624 @@ -223,4 +223,4 @@ performance_schema (table_share_hash).co performance_schema (table_share_hash).size 556 performance_schema (user_hash).count 2 performance_schema (user_hash).size 100 -performance_schema performance_schema.memory 69449312 +performance_schema performance_schema.memory 69559328 === modified file 'mysql-test/suite/perfschema/t/sizing_growth.test' --- a/mysql-test/suite/perfschema/t/sizing_growth.test 2012-06-06 14:19:43 +0000 +++ b/mysql-test/suite/perfschema/t/sizing_growth.test 2012-06-07 15:37:49 +0000 @@ -360,8 +360,9 @@ drop table test.t10; # - wait/synch/mutex/sql/MDL_wait::LOCK_wait_status # - wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data # - wait/synch/mutex/innodb/autoinc_mutex +# but this is very storage engine dependent # -select @mutex_per_share; +select @mutex_per_share <= 4; # # Expecting 1: @@ -441,7 +442,7 @@ select @file_per_handle; # select if( - (@mutex_per_share = 3) + (@mutex_per_share <= 4) AND (@rwlock_per_share = 1) AND (@cond_per_share = 0) AND (@file_per_share <= 2) === modified file 'storage/perfschema/pfs_autosize.cc' --- a/storage/perfschema/pfs_autosize.cc 2012-06-01 08:39:34 +0000 +++ b/storage/perfschema/pfs_autosize.cc 2012-06-07 15:37:49 +0000 @@ -47,7 +47,7 @@ static const ulong file_per_handle= 0; static const ulong socket_per_handle= 0; static const ulong thread_per_handle= 0; -static const ulong mutex_per_share= 3; +static const ulong mutex_per_share= 4; static const ulong rwlock_per_share= 3; static const ulong cond_per_share= 1; static const ulong file_per_share= 2; No bundle (reason: useless for push emails).