bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3300 to 3301)

[Ole John Aske]

 3301 Ole John Aske	2010-09-29
      spj-svs: fixed build break in last commit

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 3300 Ole John Aske	2010-09-29
      spj-svs: Minor cleanup: Removed unwanted ndb logging by changing a ndbout_c() to use DEBUG() instead.
      
      Also added a ndbrequire() in Dbspj::getCorrelationData() to assert correct format for the 
      correlation data being received.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2010-09-29 13:31:36 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2010-09-29 14:01:34 +0000
@@ -1417,7 +1417,7 @@ Dbspj::releaseNodeRows(Ptr<Request> requ
       cnt ++;
     }
     treeNodePtr.p->m_row_list.init();
-    DEBUG(""SLFifoRowListIterator: released " << cnt << " rows!")
+    DEBUG("SLFifoRowListIterator: released " << cnt << " rows!")
   }
   else
   {
@@ -1434,7 +1434,7 @@ Dbspj::releaseNodeRows(Ptr<Request> requ
       cnt++;
     }
     treeNodePtr.p->m_row_map.init();
-    DEBUG(""RowMapIterator: released " << cnt << " rows!")
+    DEBUG("RowMapIterator: released " << cnt << " rows!")
   }
 }
 


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