From: Marc Alff Date: April 26 2010 9:27am Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3150) Bug#53148 List-Archive: http://lists.mysql.com/commits/106485 X-Bug: 53148 Message-Id: <20100426092751.64628488762@MarcBook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_v1MEZqxujLVAomcLz5Q+ZA)" --Boundary_(ID_v1MEZqxujLVAomcLz5Q+ZA) 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-next-mr-bugfixing-53148/ based on revid:alik@stripped 3150 Marc Alff 2010-04-26 Bug#53148 Remove PFS_readonly_table This fix is a code cleanup only, no functional impact. The class PFS_readonly_table was not needed, and was removed. 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-04-21 06:31:36 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2010-04-26 09:27:44 +0000 @@ -333,10 +333,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-04-19 12:26:29 +0000 +++ b/storage/perfschema/pfs_engine_table.h 2010-04-26 09:27:44 +0000 @@ -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-19 12:26:29 +0000 +++ b/storage/perfschema/table_all_instr.cc 2010-04-26 09:27:44 +0000 @@ -25,7 +25,7 @@ #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 +154,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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_all_instr.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_events_waits.cc 2010-04-26 09:27:44 +0000 @@ -165,7 +165,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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_events_waits.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_events_waits_summary.cc 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_events_waits_summary.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_file_instances.cc 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_file_instances.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_file_summary.cc 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_file_summary.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_performance_timers.cc 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_performance_timers.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_processlist.cc 2010-04-26 09:27:44 +0000 @@ -69,7 +69,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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_processlist.h 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_sync_instances.cc 2010-04-26 09:27:44 +0000 @@ -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-04-19 12:26:29 +0000 +++ b/storage/perfschema/table_sync_instances.h 2010-04-26 09:27:44 +0000 @@ -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. */ --Boundary_(ID_v1MEZqxujLVAomcLz5Q+ZA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/marc.alff@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/marc.alff@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # 53148/ # testament_sha1: bb1175da866acf1fa793ceca0ab8792bc59c9e6c # timestamp: 2010-04-26 03:27:50 -0600 # base_revision_id: alik@stripped # # Begin bundle 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 --Boundary_(ID_v1MEZqxujLVAomcLz5Q+ZA)--