bzr commit into mysql-5.1-telco-7.0-spj branch (jonas:3156)

[Jonas Oreland]

#At file:///home/jonas/src/70-spj/ based on revid:jonas@stripped

 3156 Jonas Oreland	2010-05-12
      ndb spj - windows fix part 2 - attempt 1

    modified:
      storage/ndb/test/include/HugoQueryBuilder.hpp
=== modified file 'storage/ndb/test/include/HugoQueryBuilder.hpp'
--- a/storage/ndb/test/include/HugoQueryBuilder.hpp	2010-05-11 20:12:03 +0000
+++ b/storage/ndb/test/include/HugoQueryBuilder.hpp	2010-05-12 07:23:07 +0000
@@ -26,6 +26,8 @@
 class HugoQueryBuilder {
 public:
 
+  typedef Uint64 OptionMask;
+
   /**
    * Options that affects what kind of query is built
    */
@@ -64,11 +66,13 @@ public:
     /**
      * If not any options set, random query qill be created
      */
-    O_RANDOM = 0
+    O_RANDOM_OPTIONS = (OptionMask)((~(OptionMask)0) & 
+                                    ~(OptionMask)(O_SCAN | O_LOOKUP))
   };
-  typedef Uint64 OptionMask;
+  static const OptionMask OM_RANDOM_OPTIONS = (OptionMask)O_RANDOM_OPTIONS;
 
-  HugoQueryBuilder(Ndb* ndb, const NdbDictionary::Table**tabptr, OptionMask om){
+  HugoQueryBuilder(Ndb* ndb, const NdbDictionary::Table**tabptr, 
+                   OptionMask om = OM_RANDOM_OPTIONS){
     init();
     for (; * tabptr != 0; tabptr++)
       addTable(ndb, * tabptr);


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