bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3466)

[jonas oreland]

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

 3466 jonas oreland	2011-03-30
      ndb - more include mumbojumbo...

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.hpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-03-30 09:30:25 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-03-30 12:17:54 +0000
@@ -21,8 +21,11 @@
 #include <stdlib.h>
 #include <ndb_types.h>
 
-#include "NdbError.hpp"
-#include "NdbDictionary.hpp"
+// this file is currently not located in include/ndbapi
+// which means that we need to use <> to include instead of ""
+// for files located in include/ndbapi
+
+#include <NdbDictionary.hpp>
 
 class Ndb;
 class NdbQueryDef;

=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.hpp	2011-03-30 09:30:25 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.hpp	2011-03-30 12:17:54 +0000
@@ -19,12 +19,17 @@
 #define NdbQueryOperation_H
 
 #include <ndb_types.h>
+
+// this file is currently not located in include/ndbapi
+// which means that we need to use <> to include instead of ""
+// for files located in include/ndbapi
+
 /* There is no way to forward declare nested class NdbDictionary::Column,
  * so this header file must be included.*/
-#include "NdbDictionary.hpp"
+#include <NdbDictionary.hpp>
 // Needed to get NdbQueryOptions::ScanOrdering.
-#include "NdbQueryBuilder.hpp" 
-#include "NdbIndexScanOperation.hpp"
+#include "NdbQueryBuilder.hpp"
+#include <NdbIndexScanOperation.hpp>
 
 
 class Ndb;


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