bzr commit into mysql-5.1 branch (msvensson:3049) Bug#40549

[Magnus Svensson]

#At file:///home/msvensson/mysql/6.4/

 3049 Magnus Svensson	2008-11-06
      Bug#40549  Use of non-standard C++ syntax should be removed from the code
       - Fix for 6.4(expect ndbinfo)
modified:
  storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp
  storage/ndb/src/common/logger/Logger.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
  storage/ndb/src/kernel/vm/SectionReader.cpp
  storage/ndb/src/mgmsrv/DirIterator.cpp

per-file messages:
  storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp
    Remove extra ,
  storage/ndb/src/common/logger/Logger.cpp
    Remove extra ;
  storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
    Remove extra ;
  storage/ndb/src/kernel/vm/SectionReader.cpp
    Remove extra ;
  storage/ndb/src/mgmsrv/DirIterator.cpp
    Remove extra ;
=== modified file 'storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp'
--- a/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp	2008-09-19 22:10:17 +0000
+++ b/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp	2008-11-06 17:17:12 +0000
@@ -25,7 +25,7 @@ struct CreateTrigImplReq
   enum RequestType
   {
     CreateTriggerOnline = 1,
-    CreateTriggerOffline = 2,
+    CreateTriggerOffline = 2
   };
 
   STATIC_CONST( SignalLength = 11 + MAXNROFATTRIBUTESINWORDS);

=== modified file 'storage/ndb/src/common/logger/Logger.cpp'
--- a/storage/ndb/src/common/logger/Logger.cpp	2008-10-05 07:12:28 +0000
+++ b/storage/ndb/src/common/logger/Logger.cpp	2008-11-06 17:17:12 +0000
@@ -391,7 +391,8 @@ int Logger::getHandlerCount() {
   if(m_pSyslogHandler) r++;
   r+=m_pHandlerList->size();
   return r;
-};
+}
+
 
 LogHandler* Logger::getHandler(int i) {
   if(i==0) return m_pConsoleHandler;

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2008-10-07 11:24:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2008-11-06 17:17:12 +0000
@@ -205,7 +205,7 @@ void Dbtup::releaseCopyProcedure()
   first.p->m_lastSegment= cCopyLastSeg;
   
   cCopyLastSeg= RNIL;
-};
+}
   
 
 void Dbtup::copyProcedure(Signal* signal,

=== modified file 'storage/ndb/src/kernel/vm/SectionReader.cpp'
--- a/storage/ndb/src/kernel/vm/SectionReader.cpp	2008-09-10 00:32:18 +0000
+++ b/storage/ndb/src/kernel/vm/SectionReader.cpp	2008-11-06 17:17:12 +0000
@@ -197,7 +197,7 @@ SectionReader::getWordsPtr(Uint32 maxLen
   }
 
   return true;
-};
+}
 
 bool
 SectionReader::getWordsPtr(const Uint32*& readPtr,

=== modified file 'storage/ndb/src/mgmsrv/DirIterator.cpp'
--- a/storage/ndb/src/mgmsrv/DirIterator.cpp	2008-10-30 13:27:52 +0000
+++ b/storage/ndb/src/mgmsrv/DirIterator.cpp	2008-11-06 17:17:12 +0000
@@ -129,7 +129,7 @@ public:
 DirIterator::DirIterator() :
   m_impl(*new DirIteratorImpl())
 {
-};
+}
 
 DirIterator::~DirIterator()
 {