From: Marc Alff Date: December 2 2010 4:39pm Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3410) WL#4816 List-Archive: http://lists.mysql.com/commits/125830 Message-Id: <201012021639.oB26h1ww019648@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0609888188537613980==" --===============0609888188537613980== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:marc.alff@stripped 3410 Marc Alff 2010-12-02 Merge cleanup, reconciled: - WL#4816 PERFORMANCE SCHEMA SUMMARIES - performance schema bug fixes within mysql-trunk-bugfixing added: mysql-test/suite/perfschema/t/thread_cache-master.opt modified: mysql-test/suite/perfschema/t/thread_cache.test storage/perfschema/pfs_instr.cc storage/perfschema/table_setup_objects.cc === added file 'mysql-test/suite/perfschema/t/thread_cache-master.opt' --- a/mysql-test/suite/perfschema/t/thread_cache-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/perfschema/t/thread_cache-master.opt 2010-12-02 16:38:55 +0000 @@ -0,0 +1 @@ +--loose-performance_schema_max_thread_class=200 === modified file 'mysql-test/suite/perfschema/t/thread_cache.test' --- a/mysql-test/suite/perfschema/t/thread_cache.test 2010-12-01 18:46:51 +0000 +++ b/mysql-test/suite/perfschema/t/thread_cache.test 2010-12-02 16:38:55 +0000 @@ -18,6 +18,12 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +# +# Important note: +# this test is extremely sensitive to how threads are running inside the server, +# so it has it's own -master.opt file, to enforce it runs alone in mysqld +# + # Setup flush status; @@ -58,6 +64,10 @@ select @thread_id_increment; --connection default +# Debug +# select * from performance_schema.threads +# where name like "thread/sql/one_connection"; + # Wait for the disconnect con2 to complete let $wait_condition= select count(*) = 2 from performance_schema.threads @@ -76,6 +86,10 @@ let $con3_THREAD_ID=`select thread_id fr --connection default +# Debug +# select * from performance_schema.threads +# where name like "thread/sql/one_connection"; + # Wait for the disconnect con1 and con3 to complete let $wait_condition= select count(*) = 1 from performance_schema.threads @@ -122,6 +136,10 @@ select @thread_id_increment; --connection default +# Debug +# select * from performance_schema.threads +# where name like "thread/sql/one_connection"; + # Wait for the disconnect con2 to complete let $wait_condition= select count(*) = 2 from performance_schema.threads @@ -140,6 +158,10 @@ let $con3_THREAD_ID=`select thread_id fr --connection default +# Debug +# select * from performance_schema.threads +# where name like "thread/sql/one_connection"; + # Wait for the disconnect con1 and con3 to complete let $wait_condition= select count(*) = 1 from performance_schema.threads === modified file 'storage/perfschema/pfs_instr.cc' --- a/storage/perfschema/pfs_instr.cc 2010-12-02 15:05:07 +0000 +++ b/storage/perfschema/pfs_instr.cc 2010-12-02 16:38:55 +0000 @@ -686,26 +686,17 @@ PFS_thread* create_thread(PFS_thread_cla PFS_mutex *sanitize_mutex(PFS_mutex *unsafe) { - if ((&mutex_array[0] <= unsafe) && - (unsafe < &mutex_array[mutex_max])) - return unsafe; - return NULL; + SANITIZE_ARRAY_BODY(PFS_mutex, mutex_array, mutex_max, unsafe); } PFS_rwlock *sanitize_rwlock(PFS_rwlock *unsafe) { - if ((&rwlock_array[0] <= unsafe) && - (unsafe < &rwlock_array[rwlock_max])) - return unsafe; - return NULL; + SANITIZE_ARRAY_BODY(PFS_rwlock, rwlock_array, rwlock_max, unsafe); } PFS_cond *sanitize_cond(PFS_cond *unsafe) { - if ((&cond_array[0] <= unsafe) && - (unsafe < &cond_array[cond_max])) - return unsafe; - return NULL; + SANITIZE_ARRAY_BODY(PFS_cond, cond_array, cond_max, unsafe); } /** @@ -744,10 +735,7 @@ const char *sanitize_file_name(const cha PFS_file *sanitize_file(PFS_file *unsafe) { - if ((&file_array[0] <= unsafe) && - (unsafe < &file_array[file_max])) - return unsafe; - return NULL; + SANITIZE_ARRAY_BODY(PFS_file, file_array, file_max, unsafe); } /** === modified file 'storage/perfschema/table_setup_objects.cc' --- a/storage/perfschema/table_setup_objects.cc 2010-11-15 07:40:07 +0000 +++ b/storage/perfschema/table_setup_objects.cc 2010-12-02 16:38:55 +0000 @@ -297,7 +297,6 @@ int table_setup_objects::update_row_valu case 0: /* OBJECT_TYPE */ case 1: /* OBJECT_SCHEMA */ case 2: /* OBJECT_NAME */ - my_error(ER_WRONG_PERFSCHEMA_USAGE, MYF(0)); return HA_ERR_WRONG_COMMAND; #if 0 case 3: /* ENABLED */ --===============0609888188537613980== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: a722d6004ef69a6850d5dbb7ecc203715319123e # timestamp: 2010-12-02 17:39:16 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/ # base_revision_id: marc.alff@stripped\ # qy94l2o3dc1h6bcx # # Begin bundle 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 --===============0609888188537613980==--