bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:2932)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/kARxqtipSR/7.1-ndbinfo/ based on revid:frazer@stripped90703154010-30su42sf58o4geod

 2932 Magnus Blfied:
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
=== modified file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt	2009-06-23 11:55:41 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt	2009-07-03 14:55:42 +0000
@@ -53,7 +53,6 @@ ADD_LIBRARY(ndbgeneral STATIC
             ndb_opts.c
             basestring_vsnprintf.c
             Bitmask.cpp
-	    ndbinfo.cpp
 )
 TARGET_LINK_LIBRARIES(ndbgeneral zlib)
 

=== modified file 'storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp'
--- a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp	2009-07-03 10:31:30 +0000
+++ b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp	2009-07-03 14:54:34 +0000
@@ -224,7 +224,7 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
 
   // Validate tableId
   const Uint32 tableId = req.tableId;
-  if (tableId >= Ndbinfo::getNumTables())
+  if (tableId >= (Uint32)Ndbinfo::getNumTables())
   {
     jam();
     DbinfoScanRef *ref= (DbinfoScanRef*)signal->getDataPtrSend();
@@ -273,7 +273,7 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
     char create_sql[512];
     Uint32 tableId = cursor->data[0];
 
-    while(tableId < Ndbinfo::getNumTables())
+    while(tableId < (Uint32)Ndbinfo::getNumTables())
     {
       jam();
       const Ndbinfo::Table& tab = Ndbinfo::getTable(tableId);
@@ -310,11 +310,11 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
     Uint32 tableId = cursor->data[0];
     Uint32 columnId = cursor->data[1];
 
-    while(tableId < Ndbinfo::getNumTables())
+    while(tableId < (Uint32)Ndbinfo::getNumTables())
     {
       jam();
       const Ndbinfo::Table& tab = Ndbinfo::getTable(tableId);
-      while(columnId < tab.m.ncols)
+      while(columnId < (Uint32)tab.m.ncols)
       {
         jam();
         Ndbinfo::Row row(signal, req);

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