bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2893) Bug#44840

[Magnus Blåudd]

#At file:///home/msvensson/mysql/bug44840/ based on revid:magnus.blaudd@strippedc16mq2wihqu8pfa

 2893 Magnus Blåudd	2009-05-13
      BUG#44840 - ndbapi compiler warning - type qualifier ignored for function return type
       - Remove the "const"

    modified:
      storage/ndb/include/ndbapi/NdbEventOperation.hpp
      storage/ndb/include/ndbapi/NdbOperation.hpp
      storage/ndb/src/ndbapi/NdbEventOperation.cpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
=== modified file 'storage/ndb/include/ndbapi/NdbEventOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2007-04-03 10:57:18 +0000
+++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2009-05-13 10:06:50 +0000
@@ -178,22 +178,22 @@ public:
   /**
    * Check if table name has changed, for event TE_ALTER
    */
-  const bool tableNameChanged() const;
+  bool tableNameChanged() const;
 
   /**
    * Check if table frm has changed, for event TE_ALTER
    */
-  const bool tableFrmChanged() const;
+  bool tableFrmChanged() const;
 
   /**
    * Check if table fragmentation has changed, for event TE_ALTER
    */
-  const bool tableFragmentationChanged() const;
+  bool tableFragmentationChanged() const;
 
   /**
    * Check if table range partition list name has changed, for event TE_ALTER
    */
-  const bool tableRangeListChanged() const;
+  bool tableRangeListChanged() const;
 
   /**
    * Retrieve the GCI of the latest retrieved event

=== modified file 'storage/ndb/include/ndbapi/NdbOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp	2009-03-09 13:04:27 +0000
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp	2009-05-13 10:06:50 +0000
@@ -893,7 +893,7 @@ public:
   /**
    * Get the type of access for this operation
    */
-  const Type getType() const;
+  Type getType() const;
 
   /** @} *********************************************************************/
 
@@ -1571,7 +1571,7 @@ Return Value    Return the Type.
 Remark:         Gets type of access.
 ******************************************************************************/
 inline
-const NdbOperation::Type
+NdbOperation::Type
 NdbOperation::getType() const
 {
   return m_type;

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2007-04-03 10:57:18 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2009-05-13 10:06:50 +0000
@@ -96,22 +96,22 @@ NdbEventOperation::hasError() const
   return m_impl.m_has_error;
 }
 
-const bool NdbEventOperation::tableNameChanged() const
+bool NdbEventOperation::tableNameChanged() const
 {
   return m_impl.tableNameChanged();
 }
 
-const bool NdbEventOperation::tableFrmChanged() const
+bool NdbEventOperation::tableFrmChanged() const
 {
   return m_impl.tableFrmChanged();
 }
 
-const bool NdbEventOperation::tableFragmentationChanged() const
+bool NdbEventOperation::tableFragmentationChanged() const
 {
   return m_impl.tableFragmentationChanged();
 }
 
-const bool NdbEventOperation::tableRangeListChanged() const
+bool NdbEventOperation::tableRangeListChanged() const
 {
   return m_impl.tableRangeListChanged();
 }

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2009-03-23 05:48:23 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2009-05-13 10:06:50 +0000
@@ -719,22 +719,22 @@ NdbEventOperationImpl::stop()
   DBUG_RETURN(r);
 }
 
-const bool NdbEventOperationImpl::tableNameChanged() const
+bool NdbEventOperationImpl::tableNameChanged() const
 {
   return (bool)AlterTableReq::getNameFlag(m_change_mask);
 }
 
-const bool NdbEventOperationImpl::tableFrmChanged() const
+bool NdbEventOperationImpl::tableFrmChanged() const
 {
   return (bool)AlterTableReq::getFrmFlag(m_change_mask);
 }
 
-const bool NdbEventOperationImpl::tableFragmentationChanged() const
+bool NdbEventOperationImpl::tableFragmentationChanged() const
 {
   return (bool)AlterTableReq::getFragDataFlag(m_change_mask);
 }
 
-const bool NdbEventOperationImpl::tableRangeListChanged() const
+bool NdbEventOperationImpl::tableRangeListChanged() const
 {
   return (bool)AlterTableReq::getRangeListFlag(m_change_mask);
 }

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2009-03-20 08:36:40 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2009-05-13 10:06:50 +0000
@@ -373,10 +373,10 @@ public:
   int readBlobParts(char* buf, NdbBlob* blob,
                     Uint32 part, Uint32 count, Uint16* lenLoc);
   int receive_event();
-  const bool tableNameChanged() const;
-  const bool tableFrmChanged() const;
-  const bool tableFragmentationChanged() const;
-  const bool tableRangeListChanged() const;
+  bool tableNameChanged() const;
+  bool tableFrmChanged() const;
+  bool tableFragmentationChanged() const;
+  bool tableRangeListChanged() const;
   Uint64 getGCI();
   Uint32 getAnyValue() const;
   Uint64 getLatestGCI();

Attachment: [text/bzr-bundle] bzr/[e-mail]