From: Marc Alff Date: April 26 2010 1:32pm Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3151) List-Archive: http://lists.mysql.com/commits/106527 Message-Id: <20100426133247.1F9664933C5@MarcBook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_SvV8NQEPtbSFIIHobGr4Mg)" --Boundary_(ID_SvV8NQEPtbSFIIHobGr4Mg) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 3151 Marc Alff 2010-04-26 [merge] local merge modified: mysql-test/suite/rpl/r/rpl_temp_temporary.result mysql-test/suite/rpl/t/rpl_temp_temporary.test sql/log_event.cc sql/sql_class.cc sql/sql_class.h sql/sql_parse.cc === 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_SvV8NQEPtbSFIIHobGr4Mg) 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: e226b636dff2cecb0723c57611c79a4ea4bfb4c7 # timestamp: 2010-04-26 07:32:47 -0600 # base_revision_id: alfranio.correia@stripped\ # r2sz6m2qliszn3g8 # # Begin bundle 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 181cHMUf/F3JFOFCQ1xitRA= --Boundary_(ID_SvV8NQEPtbSFIIHobGr4Mg)--