From: Marc Alff Date: September 23 2010 4:13pm Subject: bzr push into mysql-next-mr-wl4816 branch (marc.alff:3194 to 3195) List-Archive: http://lists.mysql.com/commits/118963 Message-Id: <20100923161322.A120D45E81@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4006244588442185225==" --===============4006244588442185225== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3195 Marc Alff 2010-09-23 Added missing file added: storage/perfschema/table_helper.cc 3194 Marc Alff 2010-09-23 WL#4816 PERFORMANCE SCHEMA SUMMARIES added: storage/perfschema/pfs_setup_object.cc storage/perfschema/pfs_setup_object.h storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.h storage/perfschema/table_os_global_by_type.cc storage/perfschema/table_os_global_by_type.h storage/perfschema/table_setup_objects.cc storage/perfschema/table_setup_objects.h storage/perfschema/unittest/stub_pfs_defaults.h storage/perfschema/unittest/stub_server_misc.h modified: .bzr-mysql/default.conf mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/schema_lc0.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/temp_table_io.result scripts/mysql_system_tables.sql sql/sql_lex.h sql/sys_vars.cc storage/perfschema/CMakeLists.txt storage/perfschema/Makefile.am storage/perfschema/pfs.cc storage/perfschema/pfs_defaults.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/table_all_instr.cc storage/perfschema/table_all_instr.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits.h storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_events_waits_summary.h storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_file_summary.cc storage/perfschema/table_file_summary.h storage/perfschema/table_helper.h storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc === added file 'storage/perfschema/table_helper.cc' --- a/storage/perfschema/table_helper.cc 1970-01-01 00:00:00 +0000 +++ b/storage/perfschema/table_helper.cc 2010-09-23 16:12:54 +0000 @@ -0,0 +1,40 @@ +/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/** + @file storage/perfschema/table_helper.cc + Performance schema table helpers (implementation). +*/ + +#include "my_global.h" +#include "my_pthread.h" +#include "pfs_engine_table.h" +#include "table_helper.h" + +void set_field_object_type(Field *f, enum_object_type object_type) +{ + switch (object_type) + { + case OBJECT_TYPE_TABLE: + PFS_engine_table::set_field_varchar_utf8(f, "TABLE", 5); + break; + case OBJECT_TYPE_TEMPORARY_TABLE: + PFS_engine_table::set_field_varchar_utf8(f, "TEMPORARY TABLE", 15); + break; + default: + DBUG_ASSERT(false); + } +} + --===============4006244588442185225== 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: f241bf9502646b1f7981daf229e010409de4a3bb # timestamp: 2010-09-23 10:13:22 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/ # base_revision_id: marc.alff@stripped\ # lq212fzuzrl85nw4 # # Begin bundle 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 R9Q3+LuSKcKEh0rxR/g= --===============4006244588442185225==--