From: Marc Alff Date: July 16 2010 12:06am Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3114) Bug#53148 List-Archive: http://lists.mysql.com/commits/113714 X-Bug: 53148 Message-Id: <20100716000637.B78D345E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2529723479131746372==" --===============2529723479131746372== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:marc.alff@stripped 3114 Marc Alff 2010-07-15 Bug#53148 Remove PFS_readonly_table This fix is for cleanup, to resolve a remaining code review item. Backport from mysql-next-mr (5.6) to mysql-trunk (5.5). modified: storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_engine_table.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_file_instances.cc storage/perfschema/table_file_instances.h storage/perfschema/table_file_summary.cc storage/perfschema/table_file_summary.h storage/perfschema/table_performance_timers.cc storage/perfschema/table_performance_timers.h storage/perfschema/table_processlist.cc storage/perfschema/table_processlist.h storage/perfschema/table_sync_instances.cc storage/perfschema/table_sync_instances.h === modified file 'storage/perfschema/pfs_engine_table.cc' --- a/storage/perfschema/pfs_engine_table.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2010-07-16 00:06:33 +0000 @@ -18,7 +18,6 @@ Performance schema tables (implementation). */ -#include "sql_priv.h" #include "pfs_engine_table.h" #include "table_events_waits.h" @@ -327,10 +326,10 @@ ulonglong PFS_engine_table::get_field_en return f2->val_int(); } -int PFS_readonly_table::update_row_values(TABLE *, - const unsigned char *, - unsigned char *, - Field **) +int PFS_engine_table::update_row_values(TABLE *, + const unsigned char *, + unsigned char *, + Field **) { my_error(ER_WRONG_PERFSCHEMA_USAGE, MYF(0)); return HA_ERR_WRONG_COMMAND; === modified file 'storage/perfschema/pfs_engine_table.h' --- a/storage/perfschema/pfs_engine_table.h 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/pfs_engine_table.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef PFS_ENGINE_TABLE_H #define PFS_ENGINE_TABLE_H @@ -81,7 +81,7 @@ protected: @param fields Table fields */ virtual int update_row_values(TABLE *table, const unsigned char *old_buf, - unsigned char *new_buf, Field **fields)= 0; + unsigned char *new_buf, Field **fields); /** Constructor. @@ -151,27 +151,6 @@ struct PFS_engine_table_share bool m_checked; }; -/** Adapter for read only PERFORMANCE_SCHEMA tables. */ -class PFS_readonly_table : public PFS_engine_table -{ -protected: - /** - Constructor. - @param share table share - @param pos address of the m_pos position member - */ - PFS_readonly_table(const PFS_engine_table_share *share, void *pos) - : PFS_engine_table(share, pos) - {} - - ~PFS_readonly_table() - {} - - virtual int update_row_values(TABLE *table, const unsigned char *old_buf, - unsigned char *new_buf, Field **fields); - -}; - class PFS_readonly_acl : public ACL_internal_table_access { public: === modified file 'storage/perfschema/table_all_instr.cc' --- a/storage/perfschema/table_all_instr.cc 2010-04-06 21:00:01 +0000 +++ b/storage/perfschema/table_all_instr.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,22 +10,21 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_all_instr.cc Abstract tables for all instruments (implementation). */ -#include "sql_priv.h" #include "my_global.h" #include "my_pthread.h" #include "table_all_instr.h" #include "pfs_global.h" table_all_instr::table_all_instr(const PFS_engine_table_share *share) - : PFS_readonly_table(share, &m_pos), + : PFS_engine_table(share, &m_pos), m_pos(), m_next_pos() {} @@ -154,7 +153,7 @@ int table_all_instr::rnd_pos(const void table_all_instr_class::table_all_instr_class (const PFS_engine_table_share *share) - : PFS_readonly_table(share, &m_pos), + : PFS_engine_table(share, &m_pos), m_pos(), m_next_pos() {} === modified file 'storage/perfschema/table_all_instr.h' --- a/storage/perfschema/table_all_instr.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_all_instr.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_ALL_INSTR_H #define TABLE_ALL_INSTR_H @@ -63,7 +63,7 @@ struct pos_all_instr_class : public PFS_ - a view on all cond classes, - a view on all file classes */ -class table_all_instr_class : public PFS_readonly_table +class table_all_instr_class : public PFS_engine_table { public: virtual int rnd_next(); @@ -122,7 +122,7 @@ struct pos_all_instr : public PFS_double - a view on all cond instances, - a view on all file instances */ -class table_all_instr : public PFS_readonly_table +class table_all_instr : public PFS_engine_table { public: virtual int rnd_next(); === modified file 'storage/perfschema/table_events_waits.cc' --- a/storage/perfschema/table_events_waits.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_events_waits.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,15 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_events_waits.cc Table EVENTS_WAITS_xxx (implementation). */ -#include "sql_priv.h" +#include "my_global.h" +#include "my_pthread.h" #include "table_events_waits.h" #include "pfs_instr_class.h" #include "pfs_instr.h" @@ -165,7 +166,7 @@ table_events_waits_history_long::m_share table_events_waits_common::table_events_waits_common (const PFS_engine_table_share *share, void *pos) - : PFS_readonly_table(share, pos), + : PFS_engine_table(share, pos), m_row_exists(false) {} === modified file 'storage/perfschema/table_events_waits.h' --- a/storage/perfschema/table_events_waits.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_events_waits.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_EVENTS_WAITS_H #define TABLE_EVENTS_WAITS_H @@ -121,7 +121,7 @@ struct pos_events_waits_history : public Adapter, for table sharing the structure of PERFORMANCE_SCHEMA.EVENTS_WAITS_CURRENT. */ -class table_events_waits_common : public PFS_readonly_table +class table_events_waits_common : public PFS_engine_table { protected: virtual int read_row_values(TABLE *table, === modified file 'storage/perfschema/table_events_waits_summary.cc' --- a/storage/perfschema/table_events_waits_summary.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_events_waits_summary.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,16 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_events_waits_summary.cc Table EVENTS_WAITS_SUMMARY_BY_xxx (implementation). */ -#include "sql_priv.h" -#include "unireg.h" +#include "my_global.h" +#include "my_pthread.h" #include "pfs_instr_class.h" #include "pfs_column_types.h" #include "pfs_column_values.h" @@ -101,7 +101,7 @@ table_events_waits_summary_by_thread_by_ table_events_waits_summary_by_thread_by_event_name ::table_events_waits_summary_by_thread_by_event_name() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(), m_next_pos() {} === modified file 'storage/perfschema/table_events_waits_summary.h' --- a/storage/perfschema/table_events_waits_summary.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_events_waits_summary.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_EVENTS_WAITS_SUMMARY_H #define TABLE_EVENTS_WAITS_SUMMARY_H @@ -96,7 +96,7 @@ struct pos_events_waits_summary_by_threa /** Table PERFORMANCE_SCHEMA.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME. */ class table_events_waits_summary_by_thread_by_event_name - : public PFS_readonly_table + : public PFS_engine_table { public: /** Table share */ === modified file 'storage/perfschema/table_file_instances.cc' --- a/storage/perfschema/table_file_instances.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_file_instances.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,16 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_file_instances.cc Table FILE_INSTANCES (implementation). */ -#include "sql_priv.h" -#include "unireg.h" +#include "my_global.h" +#include "my_pthread.h" #include "pfs_instr.h" #include "pfs_column_types.h" #include "pfs_column_values.h" @@ -72,7 +72,7 @@ PFS_engine_table* table_file_instances:: } table_file_instances::table_file_instances() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} === modified file 'storage/perfschema/table_file_instances.h' --- a/storage/perfschema/table_file_instances.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_file_instances.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_FILE_INSTANCES_H #define TABLE_FILE_INSTANCES_H @@ -45,7 +45,7 @@ struct row_file_instances }; /** Table PERFORMANCE_SCHEMA.FILE_INSTANCES. */ -class table_file_instances : public PFS_readonly_table +class table_file_instances : public PFS_engine_table { public: /** Table share */ === modified file 'storage/perfschema/table_file_summary.cc' --- a/storage/perfschema/table_file_summary.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_file_summary.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,16 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_file_summary.cc Table FILE_SUMMARY_BY_xxx (implementation). */ -#include "sql_priv.h" -#include "unireg.h" +#include "my_global.h" +#include "my_pthread.h" #include "pfs_instr_class.h" #include "pfs_column_types.h" #include "pfs_column_values.h" @@ -88,7 +88,7 @@ int table_file_summary_by_event_name::de } table_file_summary_by_event_name::table_file_summary_by_event_name() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_pos(1), m_next_pos(1) {} @@ -251,7 +251,7 @@ int table_file_summary_by_instance::dele } table_file_summary_by_instance::table_file_summary_by_instance() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} === modified file 'storage/perfschema/table_file_summary.h' --- a/storage/perfschema/table_file_summary.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_file_summary.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_FILE_SUMMARY_H #define TABLE_FILE_SUMMARY_H @@ -46,7 +46,7 @@ struct row_file_summary_by_event_name }; /** Table PERFORMANCE_SCHEMA.FILE_SUMMARY_BY_EVENT_NAME. */ -class table_file_summary_by_event_name : public PFS_readonly_table +class table_file_summary_by_event_name : public PFS_engine_table { public: /** Table share */ @@ -105,7 +105,7 @@ struct row_file_summary_by_instance }; /** Table PERFORMANCE_SCHEMA.FILE_UMMARY_BY_INSTANCE. */ -class table_file_summary_by_instance : public PFS_readonly_table +class table_file_summary_by_instance : public PFS_engine_table { public: /** Table share */ === modified file 'storage/perfschema/table_performance_timers.cc' --- a/storage/perfschema/table_performance_timers.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_performance_timers.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,16 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_performance_timers.cc Table PERFORMANCE_TIMERS (implementation). */ -#include "sql_priv.h" #include "my_global.h" +#include "my_pthread.h" #include "table_performance_timers.h" #include "pfs_timer.h" #include "pfs_global.h" @@ -76,7 +76,7 @@ PFS_engine_table* table_performance_time } table_performance_timers::table_performance_timers() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row(NULL), m_pos(0), m_next_pos(0) { int index; === modified file 'storage/perfschema/table_performance_timers.h' --- a/storage/perfschema/table_performance_timers.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_performance_timers.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_PERFORMANCE_TIMERS_H #define TABLE_PERFORMANCE_TIMERS_H @@ -43,7 +43,7 @@ struct row_performance_timers }; /** Table PERFORMANCE_SCHEMA.PERFORMANCE_TIMERS. */ -class table_performance_timers : public PFS_readonly_table +class table_performance_timers : public PFS_engine_table { public: /** Table share. */ === modified file 'storage/perfschema/table_processlist.cc' --- a/storage/perfschema/table_processlist.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_processlist.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,15 +10,16 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_processlist.cc Table PROCESSLIST (implementation). */ -#include "sql_priv.h" +#include "my_global.h" +#include "my_pthread.h" #include "table_processlist.h" #include "pfs_instr_class.h" #include "pfs_instr.h" @@ -69,7 +70,7 @@ PFS_engine_table* table_processlist::cre } table_processlist::table_processlist() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} === modified file 'storage/perfschema/table_processlist.h' --- a/storage/perfschema/table_processlist.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_processlist.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_PROCESSIST_H #define TABLE_PROCESSIST_H @@ -45,7 +45,7 @@ struct row_processlist }; /** Table PERFORMANCE_SCHEMA.PROCESSLIST. */ -class table_processlist : public PFS_readonly_table +class table_processlist : public PFS_engine_table { public: /** Table share. */ === modified file 'storage/perfschema/table_sync_instances.cc' --- a/storage/perfschema/table_sync_instances.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_sync_instances.cc 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/table_sync_instances.cc @@ -19,8 +19,8 @@ and COND_INSTANCES (implementation). */ -#include "sql_priv.h" -#include "unireg.h" +#include "my_global.h" +#include "my_pthread.h" #include "pfs_instr.h" #include "pfs_column_types.h" #include "pfs_column_values.h" @@ -73,7 +73,7 @@ PFS_engine_table* table_mutex_instances: } table_mutex_instances::table_mutex_instances() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} @@ -241,7 +241,7 @@ PFS_engine_table* table_rwlock_instances } table_rwlock_instances::table_rwlock_instances() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} @@ -406,7 +406,7 @@ PFS_engine_table* table_cond_instances:: } table_cond_instances::table_cond_instances() - : PFS_readonly_table(&m_share, &m_pos), + : PFS_engine_table(&m_share, &m_pos), m_row_exists(false), m_pos(0), m_next_pos(0) {} === modified file 'storage/perfschema/table_sync_instances.h' --- a/storage/perfschema/table_sync_instances.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_sync_instances.h 2010-07-16 00:06:33 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef TABLE_SYNC_INSTANCE_H #define TABLE_SYNC_INSTANCE_H @@ -49,7 +49,7 @@ struct row_mutex_instances }; /** Table PERFORMANCE_SCHEMA.MUTEX_INSTANCES. */ -class table_mutex_instances : public PFS_readonly_table +class table_mutex_instances : public PFS_engine_table { public: /** Table share. */ @@ -108,7 +108,7 @@ struct row_rwlock_instances }; /** Table PERFORMANCE_SCHEMA.RWLOCK_INSTANCES. */ -class table_rwlock_instances : public PFS_readonly_table +class table_rwlock_instances : public PFS_engine_table { public: /** Table share */ @@ -161,7 +161,7 @@ struct row_cond_instances }; /** Table PERFORMANCE_SCHEMA.COND_INSTANCES. */ -class table_cond_instances : public PFS_readonly_table +class table_cond_instances : public PFS_engine_table { public: /** Table share. */ --===============2529723479131746372== 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-trunk-bugfixing-\ # cleanup/ # testament_sha1: a8b9abe180da441b1fa742c45f6acd57b7e49652 # timestamp: 2010-07-15 18:06:37 -0600 # base_revision_id: marc.alff@stripped\ # v1euoce0dd9gl6ig # # Begin bundle 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 l1QzuvhjljFHF2KX/xdyRThQkAKbEqg= --===============2529723479131746372==--