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

[Magnus Svensson]

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

 3049 Magnus Svensson	2008-11-06 [merge]
      Merge
modified:
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
  storage/ndb/tools/restore/consumer_restore.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-11-06 15:26:28 +0000
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-11-06 15:31:00 +0000
@@ -2787,7 +2787,7 @@ const NdbIndexScanOperation::IndexBound*
 NdbIndexScanOperation::getIndexBoundFromRecAttr(NdbRecAttr* recAttr)
 {
   return &((OldApiScanRangeDefinition*)recAttr->aRef())->ib;
-};
+}
 
 
 /* Method called to release any resources allocated by the old 

=== modified file 'storage/ndb/tools/restore/consumer_restore.cpp'
--- a/storage/ndb/tools/restore/consumer_restore.cpp	2008-10-08 08:47:03 +0000
+++ b/storage/ndb/tools/restore/consumer_restore.cpp	2008-11-06 15:31:00 +0000
@@ -1931,7 +1931,7 @@ BackupRestore::check_compat_common(const
   }
 
   return false;
-};
+}
 
 void *
 BackupRestore::convert_int8_int16(const void *old_data,