Commit aa2dacee authored by Marc Alff's avatar Marc Alff

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).
parent 4b1f459a
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
Performance schema tables (implementation). Performance schema tables (implementation).
*/ */
#include "sql_priv.h"
#include "pfs_engine_table.h" #include "pfs_engine_table.h"
#include "table_events_waits.h" #include "table_events_waits.h"
...@@ -327,7 +326,7 @@ ulonglong PFS_engine_table::get_field_enum(Field *f) ...@@ -327,7 +326,7 @@ ulonglong PFS_engine_table::get_field_enum(Field *f)
return f2->val_int(); return f2->val_int();
} }
int PFS_readonly_table::update_row_values(TABLE *, int PFS_engine_table::update_row_values(TABLE *,
const unsigned char *, const unsigned char *,
unsigned char *, unsigned char *,
Field **) Field **)
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef PFS_ENGINE_TABLE_H #ifndef PFS_ENGINE_TABLE_H
#define PFS_ENGINE_TABLE_H #define PFS_ENGINE_TABLE_H
...@@ -81,7 +81,7 @@ protected: ...@@ -81,7 +81,7 @@ protected:
@param fields Table fields @param fields Table fields
*/ */
virtual int update_row_values(TABLE *table, const unsigned char *old_buf, 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. Constructor.
...@@ -151,27 +151,6 @@ struct PFS_engine_table_share ...@@ -151,27 +151,6 @@ struct PFS_engine_table_share
bool m_checked; 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 class PFS_readonly_acl : public ACL_internal_table_access
{ {
public: public:
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,22 +10,21 @@ ...@@ -10,22 +10,21 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_all_instr.cc @file storage/perfschema/table_all_instr.cc
Abstract tables for all instruments (implementation). Abstract tables for all instruments (implementation).
*/ */
#include "sql_priv.h"
#include "my_global.h" #include "my_global.h"
#include "my_pthread.h" #include "my_pthread.h"
#include "table_all_instr.h" #include "table_all_instr.h"
#include "pfs_global.h" #include "pfs_global.h"
table_all_instr::table_all_instr(const PFS_engine_table_share *share) 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() m_pos(), m_next_pos()
{} {}
...@@ -154,7 +153,7 @@ int table_all_instr::rnd_pos(const void *pos) ...@@ -154,7 +153,7 @@ int table_all_instr::rnd_pos(const void *pos)
table_all_instr_class::table_all_instr_class table_all_instr_class::table_all_instr_class
(const PFS_engine_table_share *share) (const PFS_engine_table_share *share)
: PFS_readonly_table(share, &m_pos), : PFS_engine_table(share, &m_pos),
m_pos(), m_next_pos() m_pos(), m_next_pos()
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_ALL_INSTR_H #ifndef TABLE_ALL_INSTR_H
#define TABLE_ALL_INSTR_H #define TABLE_ALL_INSTR_H
...@@ -63,7 +63,7 @@ struct pos_all_instr_class : public PFS_double_index, ...@@ -63,7 +63,7 @@ struct pos_all_instr_class : public PFS_double_index,
- a view on all cond classes, - a view on all cond classes,
- a view on all file 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: public:
virtual int rnd_next(); virtual int rnd_next();
...@@ -122,7 +122,7 @@ struct pos_all_instr : public PFS_double_index, ...@@ -122,7 +122,7 @@ struct pos_all_instr : public PFS_double_index,
- a view on all cond instances, - a view on all cond instances,
- a view on all file instances - a view on all file instances
*/ */
class table_all_instr : public PFS_readonly_table class table_all_instr : public PFS_engine_table
{ {
public: public:
virtual int rnd_next(); virtual int rnd_next();
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,15 +10,16 @@ ...@@ -10,15 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_events_waits.cc @file storage/perfschema/table_events_waits.cc
Table EVENTS_WAITS_xxx (implementation). Table EVENTS_WAITS_xxx (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "my_pthread.h"
#include "table_events_waits.h" #include "table_events_waits.h"
#include "pfs_instr_class.h" #include "pfs_instr_class.h"
#include "pfs_instr.h" #include "pfs_instr.h"
...@@ -165,7 +166,7 @@ table_events_waits_history_long::m_share= ...@@ -165,7 +166,7 @@ table_events_waits_history_long::m_share=
table_events_waits_common::table_events_waits_common table_events_waits_common::table_events_waits_common
(const PFS_engine_table_share *share, void *pos) (const PFS_engine_table_share *share, void *pos)
: PFS_readonly_table(share, pos), : PFS_engine_table(share, pos),
m_row_exists(false) m_row_exists(false)
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_EVENTS_WAITS_H #ifndef TABLE_EVENTS_WAITS_H
#define TABLE_EVENTS_WAITS_H #define TABLE_EVENTS_WAITS_H
...@@ -121,7 +121,7 @@ struct pos_events_waits_history : public PFS_double_index ...@@ -121,7 +121,7 @@ struct pos_events_waits_history : public PFS_double_index
Adapter, for table sharing the structure of Adapter, for table sharing the structure of
PERFORMANCE_SCHEMA.EVENTS_WAITS_CURRENT. PERFORMANCE_SCHEMA.EVENTS_WAITS_CURRENT.
*/ */
class table_events_waits_common : public PFS_readonly_table class table_events_waits_common : public PFS_engine_table
{ {
protected: protected:
virtual int read_row_values(TABLE *table, virtual int read_row_values(TABLE *table,
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_events_waits_summary.cc @file storage/perfschema/table_events_waits_summary.cc
Table EVENTS_WAITS_SUMMARY_BY_xxx (implementation). Table EVENTS_WAITS_SUMMARY_BY_xxx (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "unireg.h" #include "my_pthread.h"
#include "pfs_instr_class.h" #include "pfs_instr_class.h"
#include "pfs_column_types.h" #include "pfs_column_types.h"
#include "pfs_column_values.h" #include "pfs_column_values.h"
...@@ -101,7 +101,7 @@ table_events_waits_summary_by_thread_by_event_name::delete_all_rows(void) ...@@ -101,7 +101,7 @@ table_events_waits_summary_by_thread_by_event_name::delete_all_rows(void)
table_events_waits_summary_by_thread_by_event_name table_events_waits_summary_by_thread_by_event_name
::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() m_row_exists(false), m_pos(), m_next_pos()
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_EVENTS_WAITS_SUMMARY_H #ifndef TABLE_EVENTS_WAITS_SUMMARY_H
#define TABLE_EVENTS_WAITS_SUMMARY_H #define TABLE_EVENTS_WAITS_SUMMARY_H
...@@ -96,7 +96,7 @@ struct pos_events_waits_summary_by_thread_by_event_name ...@@ -96,7 +96,7 @@ struct pos_events_waits_summary_by_thread_by_event_name
/** Table PERFORMANCE_SCHEMA.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME. */ /** Table PERFORMANCE_SCHEMA.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME. */
class table_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: public:
/** Table share */ /** Table share */
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_file_instances.cc @file storage/perfschema/table_file_instances.cc
Table FILE_INSTANCES (implementation). Table FILE_INSTANCES (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "unireg.h" #include "my_pthread.h"
#include "pfs_instr.h" #include "pfs_instr.h"
#include "pfs_column_types.h" #include "pfs_column_types.h"
#include "pfs_column_values.h" #include "pfs_column_values.h"
...@@ -72,7 +72,7 @@ PFS_engine_table* table_file_instances::create(void) ...@@ -72,7 +72,7 @@ PFS_engine_table* table_file_instances::create(void)
} }
table_file_instances::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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_FILE_INSTANCES_H #ifndef TABLE_FILE_INSTANCES_H
#define TABLE_FILE_INSTANCES_H #define TABLE_FILE_INSTANCES_H
...@@ -45,7 +45,7 @@ struct row_file_instances ...@@ -45,7 +45,7 @@ struct row_file_instances
}; };
/** Table PERFORMANCE_SCHEMA.FILE_INSTANCES. */ /** Table PERFORMANCE_SCHEMA.FILE_INSTANCES. */
class table_file_instances : public PFS_readonly_table class table_file_instances : public PFS_engine_table
{ {
public: public:
/** Table share */ /** Table share */
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_file_summary.cc @file storage/perfschema/table_file_summary.cc
Table FILE_SUMMARY_BY_xxx (implementation). Table FILE_SUMMARY_BY_xxx (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "unireg.h" #include "my_pthread.h"
#include "pfs_instr_class.h" #include "pfs_instr_class.h"
#include "pfs_column_types.h" #include "pfs_column_types.h"
#include "pfs_column_values.h" #include "pfs_column_values.h"
...@@ -88,7 +88,7 @@ int table_file_summary_by_event_name::delete_all_rows(void) ...@@ -88,7 +88,7 @@ int table_file_summary_by_event_name::delete_all_rows(void)
} }
table_file_summary_by_event_name::table_file_summary_by_event_name() 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) m_pos(1), m_next_pos(1)
{} {}
...@@ -251,7 +251,7 @@ int table_file_summary_by_instance::delete_all_rows(void) ...@@ -251,7 +251,7 @@ int table_file_summary_by_instance::delete_all_rows(void)
} }
table_file_summary_by_instance::table_file_summary_by_instance() 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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_FILE_SUMMARY_H #ifndef TABLE_FILE_SUMMARY_H
#define TABLE_FILE_SUMMARY_H #define TABLE_FILE_SUMMARY_H
...@@ -46,7 +46,7 @@ struct row_file_summary_by_event_name ...@@ -46,7 +46,7 @@ struct row_file_summary_by_event_name
}; };
/** Table PERFORMANCE_SCHEMA.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: public:
/** Table share */ /** Table share */
...@@ -105,7 +105,7 @@ struct row_file_summary_by_instance ...@@ -105,7 +105,7 @@ struct row_file_summary_by_instance
}; };
/** Table PERFORMANCE_SCHEMA.FILE_UMMARY_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: public:
/** Table share */ /** Table share */
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_performance_timers.cc @file storage/perfschema/table_performance_timers.cc
Table PERFORMANCE_TIMERS (implementation). Table PERFORMANCE_TIMERS (implementation).
*/ */
#include "sql_priv.h"
#include "my_global.h" #include "my_global.h"
#include "my_pthread.h"
#include "table_performance_timers.h" #include "table_performance_timers.h"
#include "pfs_timer.h" #include "pfs_timer.h"
#include "pfs_global.h" #include "pfs_global.h"
...@@ -76,7 +76,7 @@ PFS_engine_table* table_performance_timers::create(void) ...@@ -76,7 +76,7 @@ PFS_engine_table* table_performance_timers::create(void)
} }
table_performance_timers::table_performance_timers() 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) m_row(NULL), m_pos(0), m_next_pos(0)
{ {
int index; int index;
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_PERFORMANCE_TIMERS_H #ifndef TABLE_PERFORMANCE_TIMERS_H
#define TABLE_PERFORMANCE_TIMERS_H #define TABLE_PERFORMANCE_TIMERS_H
...@@ -43,7 +43,7 @@ struct row_performance_timers ...@@ -43,7 +43,7 @@ struct row_performance_timers
}; };
/** Table PERFORMANCE_SCHEMA.PERFORMANCE_TIMERS. */ /** Table PERFORMANCE_SCHEMA.PERFORMANCE_TIMERS. */
class table_performance_timers : public PFS_readonly_table class table_performance_timers : public PFS_engine_table
{ {
public: public:
/** Table share. */ /** Table share. */
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,15 +10,16 @@ ...@@ -10,15 +10,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_processlist.cc @file storage/perfschema/table_processlist.cc
Table PROCESSLIST (implementation). Table PROCESSLIST (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "my_pthread.h"
#include "table_processlist.h" #include "table_processlist.h"
#include "pfs_instr_class.h" #include "pfs_instr_class.h"
#include "pfs_instr.h" #include "pfs_instr.h"
...@@ -69,7 +70,7 @@ PFS_engine_table* table_processlist::create(void) ...@@ -69,7 +70,7 @@ PFS_engine_table* table_processlist::create(void)
} }
table_processlist::table_processlist() 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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_PROCESSIST_H #ifndef TABLE_PROCESSIST_H
#define TABLE_PROCESSIST_H #define TABLE_PROCESSIST_H
...@@ -45,7 +45,7 @@ struct row_processlist ...@@ -45,7 +45,7 @@ struct row_processlist
}; };
/** Table PERFORMANCE_SCHEMA.PROCESSLIST. */ /** Table PERFORMANCE_SCHEMA.PROCESSLIST. */
class table_processlist : public PFS_readonly_table class table_processlist : public PFS_engine_table
{ {
public: public:
/** Table share. */ /** Table share. */
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/** /**
@file storage/perfschema/table_sync_instances.cc @file storage/perfschema/table_sync_instances.cc
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
and COND_INSTANCES (implementation). and COND_INSTANCES (implementation).
*/ */
#include "sql_priv.h" #include "my_global.h"
#include "unireg.h" #include "my_pthread.h"
#include "pfs_instr.h" #include "pfs_instr.h"
#include "pfs_column_types.h" #include "pfs_column_types.h"
#include "pfs_column_values.h" #include "pfs_column_values.h"
...@@ -73,7 +73,7 @@ PFS_engine_table* table_mutex_instances::create(void) ...@@ -73,7 +73,7 @@ PFS_engine_table* table_mutex_instances::create(void)
} }
table_mutex_instances::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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
...@@ -241,7 +241,7 @@ PFS_engine_table* table_rwlock_instances::create(void) ...@@ -241,7 +241,7 @@ PFS_engine_table* table_rwlock_instances::create(void)
} }
table_rwlock_instances::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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
...@@ -406,7 +406,7 @@ PFS_engine_table* table_cond_instances::create(void) ...@@ -406,7 +406,7 @@ PFS_engine_table* table_cond_instances::create(void)
} }
table_cond_instances::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) m_row_exists(false), m_pos(0), m_next_pos(0)
{} {}
......
/* 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 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 it under the terms of the GNU General Public License as published by
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
#ifndef TABLE_SYNC_INSTANCE_H #ifndef TABLE_SYNC_INSTANCE_H
#define TABLE_SYNC_INSTANCE_H #define TABLE_SYNC_INSTANCE_H
...@@ -49,7 +49,7 @@ struct row_mutex_instances ...@@ -49,7 +49,7 @@ struct row_mutex_instances
}; };
/** Table PERFORMANCE_SCHEMA.MUTEX_INSTANCES. */ /** Table PERFORMANCE_SCHEMA.MUTEX_INSTANCES. */
class table_mutex_instances : public PFS_readonly_table class table_mutex_instances : public PFS_engine_table
{ {
public: public:
/** Table share. */ /** Table share. */
...@@ -108,7 +108,7 @@ struct row_rwlock_instances ...@@ -108,7 +108,7 @@ struct row_rwlock_instances
}; };
/** Table PERFORMANCE_SCHEMA.RWLOCK_INSTANCES. */ /** Table PERFORMANCE_SCHEMA.RWLOCK_INSTANCES. */
class table_rwlock_instances : public PFS_readonly_table class table_rwlock_instances : public PFS_engine_table
{ {
public: public:
/** Table share */ /** Table share */
...@@ -161,7 +161,7 @@ struct row_cond_instances ...@@ -161,7 +161,7 @@ struct row_cond_instances
}; };
/** Table PERFORMANCE_SCHEMA.COND_INSTANCES. */ /** Table PERFORMANCE_SCHEMA.COND_INSTANCES. */
class table_cond_instances : public PFS_readonly_table class table_cond_instances : public PFS_engine_table
{ {
public: public:
/** Table share. */ /** Table share. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment