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

[jonas oreland]

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

 3467 jonas oreland	2011-03-30
      ndb - another try'll and terror attempt to fix includes of NdbQuery*

    modified:
      storage/ndb/src/ndbapi/API.hpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.hpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/src/ndbapi/ndberror_check.cpp
      storage/ndb/test/include/HugoQueries.hpp
      storage/ndb/test/tools/spj_performance_test.cpp
      storage/ndb/test/tools/spj_sanity_test.cpp
=== modified file 'storage/ndb/src/ndbapi/API.hpp'
--- a/storage/ndb/src/ndbapi/API.hpp	2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/API.hpp	2011-03-30 13:26:02 +0000
@@ -44,6 +44,8 @@
 #include <NdbEventOperation.hpp>
 #include "NdbEventOperationImpl.hpp"
 
+#include "NdbQueryBuilder.hpp"
+#include "NdbQueryOperation.hpp"
 #include "NdbQueryOperationImpl.hpp"
 
 #include <NdbReceiver.hpp>

=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-03-17 12:25:32 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-03-30 13:26:02 +0000
@@ -16,20 +16,20 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include <NdbDictionary.hpp>
+#include "NdbIndexScanOperation.hpp"
 #include "NdbQueryBuilder.hpp"
 #include "NdbQueryBuilderImpl.hpp"
 #include <ndb_global.h>
 #include <Vector.hpp>
 #include "signaldata/QueryTree.hpp"
 
-#include "Ndb.hpp"
-#include "NdbDictionary.hpp"
+#include <Ndb.hpp>
 #include "NdbDictionaryImpl.hpp"
-#include "NdbRecord.hpp"
+#include <NdbRecord.hpp>
 #include "AttributeHeader.hpp"
-#include "NdbIndexScanOperation.hpp"
 #include "NdbOut.hpp"
-#include "NdbInterpretedCode.hpp"
+#include <NdbInterpretedCode.hpp>
 
 /**
  * Implementation of all QueryBuilder objects are hidden from

=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-03-30 12:17:54 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp	2011-03-30 13:26:02 +0000
@@ -22,10 +22,8 @@
 #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
-
-#include <NdbDictionary.hpp>
+// skip includes...and require them to be included first
+// BUH!
 
 class Ndb;
 class NdbQueryDef;

=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-03-30 07:02:22 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-03-30 13:26:02 +0000
@@ -18,8 +18,11 @@
 
 
 #include <ndb_global.h>
+#include <NdbDictionary.hpp>
+#include <NdbIndexScanOperation.hpp>
+#include "NdbQueryBuilder.hpp"
+#include "NdbQueryOperation.hpp"
 #include "API.hpp"
-#include <NdbQueryBuilder.hpp>
 #include "NdbQueryBuilderImpl.hpp"
 #include "NdbQueryOperationImpl.hpp"
 #include "NdbInterpretedCode.hpp"

=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.hpp	2011-03-30 12:17:54 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.hpp	2011-03-30 13:26:02 +0000
@@ -24,12 +24,17 @@
 // which means that we need to use <> to include instead of ""
 // for files located in include/ndbapi
 
+// this file is currently not located in include/ndbapi
+// skip includes...and require them to be included first
+// BUH!
+
 /* 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;

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2011-02-08 12:14:41 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2011-03-30 13:26:02 +0000
@@ -17,11 +17,13 @@
 
 
 #include <ndb_global.h>
+
 #include <my_base.h>
 #include <ndberror.h>
 #include <m_string.h>
 
 #include "../mgmsrv/ndb_mgmd_error.h"
+
 #include "NdbQueryBuilderImpl.hpp"
 
 typedef struct ErrorBundle {

=== modified file 'storage/ndb/src/ndbapi/ndberror_check.cpp'
--- a/storage/ndb/src/ndbapi/ndberror_check.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/ndbapi/ndberror_check.cpp	2011-03-30 13:26:02 +0000
@@ -17,6 +17,7 @@
 */
 
 #include <stdio.h>
+#include <NdbDictionary.hpp>
 #include "ndberror.c"
 
 // Mock implementation of 'my_snprintf'

=== modified file 'storage/ndb/test/include/HugoQueries.hpp'
--- a/storage/ndb/test/include/HugoQueries.hpp	2011-03-30 09:30:25 +0000
+++ b/storage/ndb/test/include/HugoQueries.hpp	2011-03-30 13:26:02 +0000
@@ -23,6 +23,7 @@
 #include <NDBT.hpp>
 #include <HugoCalculator.hpp>
 #include <HugoOperations.hpp>
+#include "../../src/ndbapi/NdbQueryBuilder.hpp"
 #include "../../src/ndbapi/NdbQueryOperation.hpp"
 
 class HugoQueries

=== modified file 'storage/ndb/test/tools/spj_performance_test.cpp'
--- a/storage/ndb/test/tools/spj_performance_test.cpp	2011-03-30 10:54:30 +0000
+++ b/storage/ndb/test/tools/spj_performance_test.cpp	2011-03-30 13:26:02 +0000
@@ -9,8 +9,8 @@
 #include <ndb_opts.h>
 #include <NDBT.hpp>
 #include <NdbApi.hpp>
-#include "../../src/ndbapi/NdbQueryOperation.hpp"
 #include "../../src/ndbapi/NdbQueryBuilder.hpp"
+#include "../../src/ndbapi/NdbQueryOperation.hpp"
 #include <pthread.h>
 #include <NdbTick.h>
 

=== modified file 'storage/ndb/test/tools/spj_sanity_test.cpp'
--- a/storage/ndb/test/tools/spj_sanity_test.cpp	2011-03-30 10:54:30 +0000
+++ b/storage/ndb/test/tools/spj_sanity_test.cpp	2011-03-30 13:26:02 +0000
@@ -7,8 +7,9 @@
 #include <ndb_opts.h>
 #include <NDBT.hpp>
 #include <NdbApi.hpp>
-#include "../../src/ndbapi/NdbQueryOperation.hpp"
 #include "../../src/ndbapi/NdbQueryBuilder.hpp"
+#include "../../src/ndbapi/NdbQueryOperation.hpp"
+
 
 /* TODO:
  - RecAttr and setResultRowBuff result retrieval.


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