From: Marc Alff Date: July 15 2010 11:44pm Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3113) List-Archive: http://lists.mysql.com/commits/113713 Message-Id: <20100715234449.BF1AD45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5835487713409578512==" --===============5835487713409578512== 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:davi.arnaut@stripped 3113 Marc Alff 2010-07-15 Fixed Copyright headers in storage/perfschema Fixed minor merge issues with #includes modified: storage/perfschema/CMakeLists.txt storage/perfschema/Makefile.am storage/perfschema/ha_perfschema.cc storage/perfschema/ha_perfschema.h storage/perfschema/pfs.cc storage/perfschema/pfs.h storage/perfschema/pfs_atomic.cc storage/perfschema/pfs_atomic.h storage/perfschema/pfs_check.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.cc storage/perfschema/pfs_column_values.h storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_lock.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/plug.in storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_consumers.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_timers.cc storage/perfschema/table_setup_timers.h storage/perfschema/unittest/CMakeLists.txt storage/perfschema/unittest/conf.txt storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/pfs_instr_class-t.cc storage/perfschema/unittest/pfs_timer-t.cc storage/perfschema/unittest/stub_pfs_global.h storage/perfschema/unittest/stub_print_error.h === modified file 'storage/perfschema/CMakeLists.txt' --- a/storage/perfschema/CMakeLists.txt 2010-02-01 22:46:02 +0000 +++ b/storage/perfschema/CMakeLists.txt 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc. +# Copyright (c) 2009, 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,9 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +# along with this program; if not, write to the Free Software Foundation, +# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include === modified file 'storage/perfschema/Makefile.am' --- a/storage/perfschema/Makefile.am 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/Makefile.am 2010-07-15 23:44:45 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program; if not, write to the Free Software Foundation, +# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA #called from the top level Makefile === modified file 'storage/perfschema/ha_perfschema.cc' --- a/storage/perfschema/ha_perfschema.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/ha_perfschema.cc 2010-07-15 23:44:45 +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,18 +10,19 @@ 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/ha_perfschema.cc Performance schema storage engine (implementation). */ -#include "sql_priv.h" -#include "unireg.h" -#include "ha_perfschema.h" +#include "my_global.h" +#include "my_pthread.h" +#include "sql_plugin.h" #include "mysql/plugin.h" +#include "ha_perfschema.h" #include "pfs_engine_table.h" #include "pfs_column_values.h" #include "pfs_instr_class.h" @@ -145,7 +146,7 @@ mysql_declare_plugin(perfschema) MYSQL_STORAGE_ENGINE_PLUGIN, &pfs_storage_engine, pfs_engine_name, - "Marc Alff, Sun Microsystems", + "Marc Alff, Oracle", /* Formerly Sun Microsystems, formerly MySQL */ "Performance Schema", PLUGIN_LICENSE_GPL, pfs_init_func, /* Plugin Init */ === modified file 'storage/perfschema/ha_perfschema.h' --- a/storage/perfschema/ha_perfschema.h 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/ha_perfschema.h 2010-07-15 23:44:45 +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 HA_PERFSCHEMA_H #define HA_PERFSCHEMA_H === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2010-07-09 23:00:24 +0000 +++ b/storage/perfschema/pfs.cc 2010-07-15 23:44:45 +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/pfs.cc === modified file 'storage/perfschema/pfs.h' --- a/storage/perfschema/pfs.h 2010-04-06 14:08:51 +0000 +++ b/storage/perfschema/pfs.h 2010-07-15 23:44:45 +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_H #define PFS_H @@ -23,9 +23,8 @@ #define HAVE_PSI_1 -#include #include -#include +#include #include extern struct PSI_bootstrap PFS_bootstrap; === modified file 'storage/perfschema/pfs_atomic.cc' --- a/storage/perfschema/pfs_atomic.cc 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_atomic.cc 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Sun Microsystems, Inc +/* Copyright (c) 2009, 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/pfs_atomic.cc === modified file 'storage/perfschema/pfs_atomic.h' --- a/storage/perfschema/pfs_atomic.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_atomic.h 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Sun Microsystems, Inc +/* Copyright (c) 2009, 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_ATOMIC_H #define PFS_ATOMIC_H === modified file 'storage/perfschema/pfs_check.cc' --- a/storage/perfschema/pfs_check.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/pfs_check.cc 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Sun Microsystems, Inc +/* Copyright (c) 2009, 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/pfs_check.cc @@ -23,7 +23,6 @@ */ #include "my_global.h" -#include "sql_priv.h" #include "pfs_server.h" #include "pfs_engine_table.h" === modified file 'storage/perfschema/pfs_column_types.h' --- a/storage/perfschema/pfs_column_types.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_column_types.h 2010-07-15 23:44:45 +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_COLUMN_TYPES_H #define PFS_COLUMN_TYPES_H === modified file 'storage/perfschema/pfs_column_values.cc' --- a/storage/perfschema/pfs_column_values.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/pfs_column_values.cc 2010-07-15 23:44:45 +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/pfs_column_values.cc @@ -19,7 +19,6 @@ schema tables (implementation). */ -#include "sql_priv.h" #include "pfs_column_values.h" LEX_STRING PERFORMANCE_SCHEMA_str= === modified file 'storage/perfschema/pfs_column_values.h' --- a/storage/perfschema/pfs_column_values.h 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/pfs_column_values.h 2010-07-15 23:44:45 +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_COLUMN_VALUES_H #define PFS_COLUMN_VALUES_H === modified file 'storage/perfschema/pfs_events_waits.cc' --- a/storage/perfschema/pfs_events_waits.cc 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_events_waits.cc 2010-07-15 23:44:45 +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/pfs_events_waits.cc === modified file 'storage/perfschema/pfs_events_waits.h' --- a/storage/perfschema/pfs_events_waits.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_events_waits.h 2010-07-15 23:44:45 +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_EVENTS_WAITS_H #define PFS_EVENTS_WAITS_H === modified file 'storage/perfschema/pfs_instr_class.cc' --- a/storage/perfschema/pfs_instr_class.cc 2010-05-31 15:29:54 +0000 +++ b/storage/perfschema/pfs_instr_class.cc 2010-07-15 23:44:45 +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/pfs_instr_class.cc === modified file 'storage/perfschema/pfs_instr_class.h' --- a/storage/perfschema/pfs_instr_class.h 2010-04-06 14:08:51 +0000 +++ b/storage/perfschema/pfs_instr_class.h 2010-07-15 23:44:45 +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_INSTR_CLASS_H #define PFS_INSTR_CLASS_H @@ -38,7 +38,6 @@ */ #define PFS_MAX_FULL_PREFIX_NAME_LENGTH 32 -#include #include #include #include "pfs_lock.h" === modified file 'storage/perfschema/pfs_lock.h' --- a/storage/perfschema/pfs_lock.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_lock.h 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Sun Microsystems, Inc +/* Copyright (c) 2009, 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_LOCK_H #define PFS_LOCK_H === modified file 'storage/perfschema/pfs_server.cc' --- a/storage/perfschema/pfs_server.cc 2010-05-31 15:29:54 +0000 +++ b/storage/perfschema/pfs_server.cc 2010-07-15 23:44:45 +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/pfs_server.cc @@ -21,7 +21,6 @@ #include "my_global.h" #include "my_sys.h" #include "mysys_err.h" -#include "sql_priv.h" #include "pfs_server.h" #include "pfs.h" #include "pfs_global.h" === modified file 'storage/perfschema/pfs_server.h' --- a/storage/perfschema/pfs_server.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_server.h 2010-07-15 23:44:45 +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_SERVER_H #define PFS_SERVER_H === modified file 'storage/perfschema/pfs_stat.h' --- a/storage/perfschema/pfs_stat.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_stat.h 2010-07-15 23:44:45 +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_STAT_H #define PFS_STAT_H === modified file 'storage/perfschema/pfs_timer.cc' --- a/storage/perfschema/pfs_timer.cc 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_timer.cc 2010-07-15 23:44:45 +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/pfs_timer.cc === modified file 'storage/perfschema/pfs_timer.h' --- a/storage/perfschema/pfs_timer.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/pfs_timer.h 2010-07-15 23:44:45 +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_TIMER_H #define PFS_TIMER_H === modified file 'storage/perfschema/plug.in' --- a/storage/perfschema/plug.in 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/plug.in 2010-07-15 23:44:45 +0000 @@ -1,6 +1,6 @@ dnl -*- ksh -*- -# 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 @@ -12,8 +12,8 @@ dnl -*- ksh -*- # 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 dnl This file is part of the configure scripts used by autoconf. === modified file 'storage/perfschema/table_setup_consumers.cc' --- a/storage/perfschema/table_setup_consumers.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_setup_consumers.cc 2010-07-15 23:44:45 +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_setup_consumers.cc Table SETUP_CONSUMERS (implementation). */ -#include "sql_priv.h" +#include "my_global.h" +#include "my_pthread.h" #include "table_setup_consumers.h" #include "pfs_instr.h" #include "pfs_events_waits.h" === modified file 'storage/perfschema/table_setup_consumers.h' --- a/storage/perfschema/table_setup_consumers.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_setup_consumers.h 2010-07-15 23:44:45 +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_SETUP_CONSUMERS_H #define TABLE_SETUP_CONSUMERS_H === modified file 'storage/perfschema/table_setup_instruments.cc' --- a/storage/perfschema/table_setup_instruments.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_setup_instruments.cc 2010-07-15 23:44:45 +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_setup_instruments.cc Table SETUP_INSTRUMENTS (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" === modified file 'storage/perfschema/table_setup_instruments.h' --- a/storage/perfschema/table_setup_instruments.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_setup_instruments.h 2010-07-15 23:44:45 +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_SETUP_INSTRUMENTS_H #define TABLE_SETUP_INSTRUMENTS_H === modified file 'storage/perfschema/table_setup_timers.cc' --- a/storage/perfschema/table_setup_timers.cc 2010-03-31 14:05:33 +0000 +++ b/storage/perfschema/table_setup_timers.cc 2010-07-15 23:44:45 +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_setup_timers.cc Table SETUP_TIMERS (implementation). */ -#include "sql_priv.h" +#include "my_global.h" +#include "my_pthread.h" #include "table_setup_timers.h" #include "pfs_column_values.h" #include "pfs_timer.h" === modified file 'storage/perfschema/table_setup_timers.h' --- a/storage/perfschema/table_setup_timers.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/table_setup_timers.h 2010-07-15 23:44:45 +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_SETUP_TIMERS_H #define TABLE_SETUP_TIMERS_H === modified file 'storage/perfschema/unittest/CMakeLists.txt' --- a/storage/perfschema/unittest/CMakeLists.txt 2010-01-14 18:42:28 +0000 +++ b/storage/perfschema/unittest/CMakeLists.txt 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program; if not, write to the Free Software Foundation, +# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/mysql === modified file 'storage/perfschema/unittest/conf.txt' --- a/storage/perfschema/unittest/conf.txt 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/unittest/conf.txt 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2009, 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 Performance schema test configurations. (Used internally for performance testing) === modified file 'storage/perfschema/unittest/pfs-t.cc' --- a/storage/perfschema/unittest/pfs-t.cc 2010-07-09 23:00:24 +0000 +++ b/storage/perfschema/unittest/pfs-t.cc 2010-07-15 23:44:45 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 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,12 +10,11 @@ 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 */ -#include -#include #include +#include #include #include #include === modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc' --- a/storage/perfschema/unittest/pfs_instr-oom-t.cc 2010-04-13 11:48:46 +0000 +++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc 2010-07-15 23:44:45 +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,12 +10,11 @@ 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 */ -#include -#include #include +#include #include #include #include === modified file 'storage/perfschema/unittest/pfs_instr-t.cc' --- a/storage/perfschema/unittest/pfs_instr-t.cc 2010-04-13 11:48:46 +0000 +++ b/storage/perfschema/unittest/pfs_instr-t.cc 2010-07-15 23:44:45 +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,12 +10,11 @@ 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 */ -#include -#include #include +#include #include #include #include === modified file 'storage/perfschema/unittest/pfs_instr_class-oom-t.cc' --- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc 2010-04-13 11:48:46 +0000 +++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc 2010-07-15 23:44:45 +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,12 +10,11 @@ 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 */ -#include -#include #include +#include #include #include #include === modified file 'storage/perfschema/unittest/pfs_instr_class-t.cc' --- a/storage/perfschema/unittest/pfs_instr_class-t.cc 2010-04-13 11:48:46 +0000 +++ b/storage/perfschema/unittest/pfs_instr_class-t.cc 2010-07-15 23:44:45 +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,13 +10,11 @@ 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 */ -#include #include -#include - +#include #include // strncpy #include #include === modified file 'storage/perfschema/unittest/pfs_timer-t.cc' --- a/storage/perfschema/unittest/pfs_timer-t.cc 2010-04-12 09:31:45 +0000 +++ b/storage/perfschema/unittest/pfs_timer-t.cc 2010-07-15 23:44:45 +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,11 +10,11 @@ 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 */ -#include #include +#include #include #include "my_sys.h" #include === modified file 'storage/perfschema/unittest/stub_pfs_global.h' --- a/storage/perfschema/unittest/stub_pfs_global.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/unittest/stub_pfs_global.h 2010-07-15 23:44:45 +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 */ #include #include === modified file 'storage/perfschema/unittest/stub_print_error.h' --- a/storage/perfschema/unittest/stub_print_error.h 2010-01-12 01:47:27 +0000 +++ b/storage/perfschema/unittest/stub_print_error.h 2010-07-15 23:44:45 +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 */ #include #include --===============5835487713409578512== 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: e53888d38523da18874376ce5903992fc59ea226 # timestamp: 2010-07-15 17:44:49 -0600 # base_revision_id: davi.arnaut@stripped\ # ul1l42y20eyycqjt # # Begin bundle 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 nChIbnWPXQA= --===============5835487713409578512==--