From: Marc Alff Date: September 24 2010 9:05pm Subject: bzr push into mysql-next-mr-wl4816 branch (marc.alff:3198 to 3199) List-Archive: http://lists.mysql.com/commits/119102 Message-Id: <20100924210526.D99BE45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6301997216013851332==" --===============6301997216013851332== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3199 Marc Alff 2010-09-24 Cleanup modified: mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/temp_table_io.result storage/perfschema/pfs.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_setup_object.cc 3198 Marc Alff 2010-09-24 Test cleanup removed: mysql-test/suite/perfschema/r/schema.result modified: mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.result === modified file 'mysql-test/suite/perfschema/r/innodb_table_io.result' --- a/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-09-23 16:08:54 +0000 +++ b/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-09-24 21:04:59 +0000 @@ -106,7 +106,9 @@ wait/io/table/sql/handler handler.cc: TA wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test #sql-XXXX insert NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test #sql-XXXX insert NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL === modified file 'mysql-test/suite/perfschema/r/temp_table_io.result' --- a/mysql-test/suite/perfschema/r/temp_table_io.result 2010-09-23 16:08:54 +0000 +++ b/mysql-test/suite/perfschema/r/temp_table_io.result 2010-09-24 21:04:59 +0000 @@ -72,15 +72,42 @@ event_name short_source object_type obje wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL -wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab update NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab update NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab update NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab delete NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL +wait/io/table/sql/handler handler.cc: TEMPORARY TABLE test no_index_tab fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL show status like 'performance_schema_%'; === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2010-09-24 01:31:02 +0000 +++ b/storage/perfschema/pfs.cc 2010-09-24 21:04:59 +0000 @@ -1196,9 +1196,6 @@ static void destroy_cond_v1(PSI_cond* co static PSI_table_share* get_table_share_v1(my_bool temporary, TABLE_SHARE *share) { - /* SETUP_OBJECTS does not allow to enable temporary tables. */ - if (temporary) - return NULL; /* Do not instrument this table is all table instruments are disabled. */ if (! global_table_io_class.m_enabled) return NULL; @@ -1953,7 +1950,7 @@ get_thread_table_locker_v1(PSI_table_loc /* Refresh the enabled and timed flags from SETUP_OBJECTS */ share->m_setup_objects_version= setup_objects_version; lookup_setup_object(pfs_thread, - share->get_object_type(), + OBJECT_TYPE_TABLE, /* even for temporary tables */ share->m_schema_name, share->m_schema_name_length, share->m_table_name, === modified file 'storage/perfschema/pfs_instr_class.cc' --- a/storage/perfschema/pfs_instr_class.cc 2010-09-24 18:21:22 +0000 +++ b/storage/perfschema/pfs_instr_class.cc 2010-09-24 21:04:59 +0000 @@ -877,7 +877,7 @@ search: { version= setup_objects_version; lookup_setup_object(thread, - (temporary ? OBJECT_TYPE_TEMPORARY_TABLE : OBJECT_TYPE_TABLE), + OBJECT_TYPE_TABLE, schema_name, schema_name_length, table_name, table_name_length, &enabled, &timed); === modified file 'storage/perfschema/pfs_setup_object.cc' --- a/storage/perfschema/pfs_setup_object.cc 2010-09-24 18:21:22 +0000 +++ b/storage/perfschema/pfs_setup_object.cc 2010-09-24 21:04:59 +0000 @@ -279,6 +279,15 @@ void lookup_setup_object(PFS_thread *thr PFS_setup_object *pfs; int i; + /* + The table io instrumentation uses "TABLE" and "TEMPORARY TABLE". + SETUP_OBJECT uses "TABLE" for both concepts. + There is no way to provide a different setup for: + - TABLE foo.bar + - TEMPORARY TABLE foo.bar + */ + DBUG_ASSERT(object_type != OBJECT_TYPE_TEMPORARY_TABLE); + LF_PINS* pins= get_setup_object_hash_pins(thread); if (unlikely(pins == NULL)) { @@ -305,7 +314,7 @@ void lookup_setup_object(PFS_thread *thr schema_name, schema_name_length, "%", 1); break; case 3: - /* Lookup OBJECT_TYPE + NULL + NULL in SETUP_OBJECTS */ + /* Lookup OBJECT_TYPE + "%" + "%" in SETUP_OBJECTS */ set_setup_object_key(&key, object_type, "%", 1, "%", 1); break; } --===============6301997216013851332== 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:///home/malff/BZR_TREE/mysql-next-mr-wl4816/ # testament_sha1: 299420815b6a1e8a5aef52b79547be7f2e92eca4 # timestamp: 2010-09-24 15:05:26 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/ # base_revision_id: marc.alff@stripped\ # wr0hgzpbdfv72qpa # # Begin bundle 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 --===============6301997216013851332==--