Code change looks good. This is one of those changes where if it compiles, it most likely
works.
Patch approved
>-----Original Message-----
>From: Marc Alff
>Sent: Monday, April 26, 2010 4:28 AM
>To: commits@stripped
>Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3150)
>Bug#53148
>
>#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. */
>
