bzr commit into mysql-5.1-telco-6.2 branch (monty:2640) Bug#38177

[Monty Taylor]

#At http://bazaar.launchpad.net/~mordred/mysql-server/5.1-telco-6.2

 2640 Monty Taylor	2008-08-06
      BUG#38177 - Public headers prevent applications from being built with warnings
turned on
                        
      Fixed all of the build warnings produced by compiling a test program with: "-W -Wall
-Wextra -std=gnu++98 -pedantic -Wundef -Wredundant-decls -Wno-long-long
-Wno-strict-aliasing  -Werror"
modified:
  storage/ndb/include/mgmapi/mgmapi.h
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
  storage/ndb/include/ndbapi/NdbOperation.hpp
  storage/ndb/include/ndbapi/NdbTransaction.hpp

=== modified file 'storage/ndb/include/mgmapi/mgmapi.h'
--- a/storage/ndb/include/mgmapi/mgmapi.h	2008-03-28 10:31:07 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi.h	2008-08-07 01:34:35 +0000
@@ -443,11 +443,7 @@ extern "C" {
    */
   int ndb_mgm_number_of_mgmd_in_connect_string(NdbMgmHandle handle);
 
-  int ndb_mgm_set_configuration_nodeid(NdbMgmHandle handle, int nodeid);
   int ndb_mgm_get_configuration_nodeid(NdbMgmHandle handle);
-  int ndb_mgm_get_connected_port(NdbMgmHandle handle);
-  const char *ndb_mgm_get_connected_host(NdbMgmHandle handle);
-  const char *ndb_mgm_get_connectstring(NdbMgmHandle handle, char *buf, int buf_sz);
 
   /**
    * Set local bindaddress

=== modified file 'storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-02-19 15:00:29 +0000
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-07 01:34:35 +0000
@@ -307,7 +307,7 @@ private:
 inline
 int
 NdbIndexScanOperation::setBound(const char* attr, int type, const void* value,
-                                Uint32 len)
+                                __attribute__((__unused__))Uint32 len)
 {
   return setBound(attr, type, value);
 }
@@ -315,7 +315,7 @@ NdbIndexScanOperation::setBound(const ch
 inline
 int
 NdbIndexScanOperation::setBound(Uint32 anAttrId, int type, const void* value,
-                                Uint32 len)
+                                __attribute__((__unused__))Uint32 len)
 {
   return setBound(anAttrId, type, value);
 }

=== modified file 'storage/ndb/include/ndbapi/NdbOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp	2008-04-28 14:17:28 +0000
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp	2008-08-07 01:34:35 +0000
@@ -1447,6 +1447,9 @@ inline
 int
 NdbOperation::checkMagicNumber(bool b)
 {
+#ifndef NDB_NO_DROPPED_SIGNAL
+  (void)b;  // unused param in this context
+#endif
   if (theMagicNumber != 0xABCDEF01){
 #ifdef NDB_NO_DROPPED_SIGNAL
     if(b) abort();
@@ -1566,7 +1569,8 @@ NdbOperation::NdbCon(NdbTransaction* aNd
 
 inline
 int
-NdbOperation::equal(const char* anAttrName, const char* aValue, Uint32 len)
+NdbOperation::equal(const char* anAttrName, const char* aValue,
+                    __attribute__((__unused__))Uint32 len)
 {
   return equal(anAttrName, aValue);
 }
@@ -1601,7 +1605,8 @@ NdbOperation::equal(const char* anAttrNa
 
 inline
 int
-NdbOperation::equal(Uint32 anAttrId, const char* aValue, Uint32 len)
+NdbOperation::equal(Uint32 anAttrId, const char* aValue,
+                    __attribute__((__unused__))Uint32 len)
 {
   return equal(anAttrId, aValue);
 }
@@ -1636,7 +1641,8 @@ NdbOperation::equal(Uint32 anAttrId, Uin
 
 inline
 int
-NdbOperation::setValue(const char* anAttrName, const char* aValue, Uint32 len)
+NdbOperation::setValue(const char* anAttrName, const char* aValue,
+                       __attribute__((__unused__))Uint32 len)
 {
   return setValue(anAttrName, aValue);
 }
@@ -1685,7 +1691,8 @@ NdbOperation::setValue(const char* anAtt
 
 inline
 int
-NdbOperation::setValue(Uint32 anAttrId, const char* aValue, Uint32 len)
+NdbOperation::setValue(Uint32 anAttrId, const char* aValue,
+                       __attribute__((__unused__))Uint32 len)
 {
   return setValue(anAttrId, aValue);
 }

=== modified file 'storage/ndb/include/ndbapi/NdbTransaction.hpp'
--- a/storage/ndb/include/ndbapi/NdbTransaction.hpp	2008-02-19 15:00:29 +0000
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp	2008-08-07 01:34:35 +0000
@@ -1091,7 +1091,7 @@ NdbTransaction::get_send_size()
 
 inline
 void
-NdbTransaction::set_send_size(Uint32 send_size)
+NdbTransaction::set_send_size(__attribute__((__unused__))Uint32 send_size)
 {
   return;
 }