List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:May 16 2011 11:32am
Subject:bzr push into mysql-trunk branch (davi:3089 to 3090)
View as plain text  
 3090 Davi Arnaut	2011-05-16
      Bug 11886774 - 59611 REMOVE THE PRAGMA INTERFACE/IMPLEMENTATION DECLARATIONS
      
      Remove some left over interface/implementation pragmas.

    modified:
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/item_xmlfunc.cc
      sql/item_xmlfunc.h
      sql/sql_partition.h
 3089 Luis Soares	2011-05-16 [merge]
      BUG#12416611
      
      Automerge bzr bundle from bug report into latest mysql-trunk.

    modified:
      sql/log_event.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2011-05-10 13:41:34 +0000
+++ b/sql/ha_partition.cc	2011-05-16 11:32:07 +0000
@@ -47,10 +47,6 @@
   if this file.
 */
 
-#ifdef __GNUC__
-#pragma implementation				// gcc: Class implementation
-#endif
-
 #include "sql_priv.h"
 #include "sql_parse.h"                          // append_file_to_dir
 #include "binlog.h"                             // mysql_bin_log

=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2011-04-23 20:44:45 +0000
+++ b/sql/ha_partition.h	2011-05-16 11:32:07 +0000
@@ -16,15 +16,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#ifdef __GNUC__
-#pragma interface				/* gcc class implementation */
-#endif
-
 #include "sql_partition.h"      /* part_id_range, partition_element */
 #include "queues.h"             /* QUEUE */
 
 enum partition_keywords
-{ 
+{
   PKW_HASH= 0, PKW_RANGE, PKW_LIST, PKW_KEY, PKW_MAXVALUE, PKW_LINEAR,
   PKW_COLUMNS
 };

=== modified file 'sql/item_xmlfunc.cc'
--- a/sql/item_xmlfunc.cc	2011-03-09 20:54:55 +0000
+++ b/sql/item_xmlfunc.cc	2011-05-16 11:32:07 +0000
@@ -13,10 +13,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#ifdef __GNUC__
-#pragma implementation
-#endif
-
 #include "sql_priv.h"
 /*
   It is necessary to include set_var.h instead of item.h because there

=== modified file 'sql/item_xmlfunc.h'
--- a/sql/item_xmlfunc.h	2010-07-02 18:15:21 +0000
+++ b/sql/item_xmlfunc.h	2011-05-16 11:32:07 +0000
@@ -19,12 +19,6 @@
 
 /* This file defines all XML functions */
 
-
-#ifdef __GNUC__
-#pragma interface			/* gcc class implementation */
-#endif
-
-
 class Item_xml_str_func: public Item_str_func
 {
 protected:

=== modified file 'sql/sql_partition.h'
--- a/sql/sql_partition.h	2011-03-09 20:54:55 +0000
+++ b/sql/sql_partition.h	2011-05-16 11:32:07 +0000
@@ -16,10 +16,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#ifdef __GNUC__
-#pragma interface				/* gcc class implementation */
-#endif
-
 #include "sql_list.h"                           /* List */
 #include "table.h"                              /* TABLE_LIST */
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (davi:3089 to 3090) Davi Arnaut16 May