bzr push into mysql-5.1-telco-7.0-spj branch (jonas:2993 to 2994)

[Jonas Oreland]

 2994 Jonas Oreland	2009-11-20
      ndb-spj - fix compiler warning/error

    modified:
      storage/ndb/include/ndbapi/NdbQueryOperation.hpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
 2993 Ole John Aske	2009-11-20
      Fix of yet another build break after changing signature of ::createQuery()

    modified:
      storage/ndb/test/tools/spj_performance_test.cpp
=== modified file 'storage/ndb/include/ndbapi/NdbQueryOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbQueryOperation.hpp	2009-10-28 08:12:51 +0000
+++ b/storage/ndb/include/ndbapi/NdbQueryOperation.hpp	2009-11-20 14:23:34 +0000
@@ -24,7 +24,7 @@
 #include "NdbDictionary.hpp"
 
 class Ndb;
-class NdbError;
+struct NdbError;
 class NdbOperation;
 class NdbParamOperand;
 class NdbQueryDef;

=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2009-11-20 11:16:47 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2009-11-20 14:23:34 +0000
@@ -345,6 +345,7 @@ public:
   virtual int setBound(Uint32Buffer& keyInfo,
                        const NdbIndexScanOperation::IndexBound& bound) const {
     assert(false);
+    return 0; // silence warning
   }
 
   virtual int checkPrunable(const Uint32Buffer& keyInfo,


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