List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 3 2010 3:04pm
Subject:bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3159)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-cleanup/ based on revid:dao-gang.qu@stripped

 3159 Marc Alff	2010-05-03
      Header file cleanup

    modified:
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/pfs.h
      storage/perfschema/pfs_check.cc
      storage/perfschema/pfs_column_values.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/table_all_instr.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_file_instances.cc
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_performance_timers.cc
      storage/perfschema/table_processlist.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_sync_instances.cc
      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/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-05-03 15:04:02 +0000
@@ -18,10 +18,11 @@
   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"

=== modified file 'storage/perfschema/pfs.h'
--- a/storage/perfschema/pfs.h	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs.h	2010-05-03 15:04:02 +0000
@@ -23,9 +23,8 @@
 
 #define HAVE_PSI_1
 
-#include <sql_priv.h>
 #include <my_global.h>
-#include <unireg.h>
+#include <my_pthread.h>
 #include <mysql/psi/psi.h>
 
 extern struct PSI_bootstrap PFS_bootstrap;

=== modified file 'storage/perfschema/pfs_check.cc'
--- a/storage/perfschema/pfs_check.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs_check.cc	2010-05-03 15:04:02 +0000
@@ -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_values.cc'
--- a/storage/perfschema/pfs_column_values.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs_column_values.cc	2010-05-03 15:04:02 +0000
@@ -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_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-05-03 15:04:02 +0000
@@ -19,7 +19,6 @@
   Performance schema tables (implementation).
 */
 
-#include "sql_priv.h"
 #include "pfs_engine_table.h"
 
 #include "table_events_waits.h"

=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2010-04-13 09:49:50 +0000
+++ b/storage/perfschema/pfs_instr.cc	2010-05-03 15:04:02 +0000
@@ -21,8 +21,8 @@
 #include <string.h>
 
 #include "my_global.h"
-#include "sql_priv.h"
 #include "my_sys.h"
+#include "pfs.h"
 #include "pfs_stat.h"
 #include "pfs_instr.h"
 #include "pfs_global.h"

=== modified file 'storage/perfschema/pfs_instr.h'
--- a/storage/perfschema/pfs_instr.h	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs_instr.h	2010-05-03 15:04:02 +0000
@@ -21,7 +21,6 @@
   Performance schema instruments (declarations).
 */
 
-#include <sql_priv.h>
 #include "pfs_lock.h"
 #include "pfs_instr_class.h"
 #include "pfs_events_waits.h"

=== modified file 'storage/perfschema/pfs_instr_class.h'
--- a/storage/perfschema/pfs_instr_class.h	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs_instr_class.h	2010-05-03 15:04:02 +0000
@@ -38,7 +38,6 @@
 */
 #define PFS_MAX_FULL_PREFIX_NAME_LENGTH 32
 
-#include <sql_priv.h>
 #include <my_global.h>
 #include <mysql/psi/psi.h>
 #include "pfs_lock.h"

=== modified file 'storage/perfschema/pfs_server.cc'
--- a/storage/perfschema/pfs_server.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/pfs_server.cc	2010-05-03 15:04:02 +0000
@@ -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/table_all_instr.cc'
--- a/storage/perfschema/table_all_instr.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_all_instr.cc	2010-05-03 15:04:02 +0000
@@ -18,7 +18,6 @@
   Abstract tables for all instruments (implementation).
 */
 
-#include "sql_priv.h"
 #include "my_global.h"
 #include "my_pthread.h"
 #include "table_all_instr.h"

=== modified file 'storage/perfschema/table_events_waits.cc'
--- a/storage/perfschema/table_events_waits.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_events_waits.cc	2010-05-03 15:04:02 +0000
@@ -18,7 +18,8 @@
   Table EVENTS_WAITS_xxx (implementation).
 */
 
-#include "sql_priv.h"
+#include "my_global.h"
+#include "my_pthread.h"
 #include "table_events_waits.h"
 #include "pfs_instr_class.h"
 #include "pfs_instr.h"

=== modified file 'storage/perfschema/table_events_waits_summary.cc'
--- a/storage/perfschema/table_events_waits_summary.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_events_waits_summary.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   Table EVENTS_WAITS_SUMMARY_BY_xxx (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_file_instances.cc'
--- a/storage/perfschema/table_file_instances.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_file_instances.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   Table FILE_INSTANCES (implementation).
 */
 
-#include "sql_priv.h"
-#include "unireg.h"
+#include "my_global.h"
+#include "my_pthread.h"
 #include "pfs_instr.h"
 #include "pfs_column_types.h"
 #include "pfs_column_values.h"

=== modified file 'storage/perfschema/table_file_summary.cc'
--- a/storage/perfschema/table_file_summary.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_file_summary.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   Table FILE_SUMMARY_BY_xxx (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_performance_timers.cc'
--- a/storage/perfschema/table_performance_timers.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_performance_timers.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   Table PERFORMANCE_TIMERS (implementation).
 */
 
-#include "sql_priv.h"
 #include "my_global.h"
+#include "my_pthread.h"
 #include "table_performance_timers.h"
 #include "pfs_timer.h"
 #include "pfs_global.h"

=== modified file 'storage/perfschema/table_processlist.cc'
--- a/storage/perfschema/table_processlist.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_processlist.cc	2010-05-03 15:04:02 +0000
@@ -18,7 +18,8 @@
   Table PROCESSLIST (implementation).
 */
 
-#include "sql_priv.h"
+#include "my_global.h"
+#include "my_pthread.h"
 #include "table_processlist.h"
 #include "pfs_instr_class.h"
 #include "pfs_instr.h"

=== modified file 'storage/perfschema/table_setup_consumers.cc'
--- a/storage/perfschema/table_setup_consumers.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/table_setup_consumers.cc	2010-05-03 15:04:02 +0000
@@ -18,7 +18,8 @@
   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_instruments.cc'
--- a/storage/perfschema/table_setup_instruments.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/table_setup_instruments.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   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_objects.cc'
--- a/storage/perfschema/table_setup_objects.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/table_setup_objects.cc	2010-05-03 15:04:02 +0000
@@ -18,8 +18,8 @@
   Table SETUP_OBJECTS (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_timers.cc'
--- a/storage/perfschema/table_setup_timers.cc	2010-04-19 12:26:29 +0000
+++ b/storage/perfschema/table_setup_timers.cc	2010-05-03 15:04:02 +0000
@@ -18,7 +18,8 @@
   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_sync_instances.cc'
--- a/storage/perfschema/table_sync_instances.cc	2010-04-26 09:27:44 +0000
+++ b/storage/perfschema/table_sync_instances.cc	2010-05-03 15:04:02 +0000
@@ -19,8 +19,8 @@
   and COND_INSTANCES (implementation).
 */
 
-#include "sql_priv.h"
-#include "unireg.h"
+#include "my_global.h"
+#include "my_pthread.h"
 #include "pfs_instr.h"
 #include "pfs_column_types.h"
 #include "pfs_column_values.h"

=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-04-13 11:48:46 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2010-05-03 15:04:02 +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
@@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_pthread.h>
-#include <sql_priv.h>
 #include <my_global.h>
+#include <my_pthread.h>
 #include <pfs_server.h>
 #include <pfs_instr_class.h>
 #include <pfs_instr.h>

=== 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-05-03 15:04:02 +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
@@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_pthread.h>
-#include <sql_priv.h>
 #include <my_global.h>
+#include <my_pthread.h>
 #include <pfs_instr.h>
 #include <pfs_stat.h>
 #include <pfs_global.h>

=== 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-05-03 15:04:02 +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
@@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_pthread.h>
-#include <sql_priv.h>
 #include <my_global.h>
+#include <my_pthread.h>
 #include <pfs_instr.h>
 #include <pfs_stat.h>
 #include <pfs_global.h>

=== 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-05-03 15:04:02 +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
@@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_pthread.h>
-#include <sql_priv.h>
 #include <my_global.h>
+#include <my_pthread.h>
 #include <pfs_instr_class.h>
 #include <pfs_global.h>
 #include <tap.h>

=== 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-05-03 15:04:02 +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
@@ -13,10 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_pthread.h>
 #include <my_global.h>
-#include <sql_priv.h>
-
+#include <my_pthread.h>
 #include <string.h>                             // strncpy
 #include <pfs_instr_class.h>
 #include <pfs_instr.h>

=== 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-05-03 15:04:02 +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
@@ -13,8 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <sql_priv.h>
 #include <my_global.h>
+#include <my_pthread.h>
 #include <pfs_timer.h>
 #include "my_sys.h"
 #include <tap.h>

=== 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-05-03 15:04:02 +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

=== 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-05-03 15:04:02 +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


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100503150402-nwuttaptb9rcybnk.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3159)Marc Alff3 May