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

[jonas oreland]

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

 3463 jonas oreland	2011-03-30
      ndb spj - redo move of NdbQuery* by not using Makefile.am..and instead changing actual includes...cause the Makefile.am stuff doesnt work in CMake...

    modified:
      libmysqld/Makefile.am
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_push.cc
      storage/ndb/test/tools/Makefile.am
      storage/ndb/test/tools/spj_performance_test.cpp
      storage/ndb/test/tools/spj_sanity_test.cpp
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2011-03-30 09:30:25 +0000
+++ b/libmysqld/Makefile.am	2011-03-30 10:54:30 +0000
@@ -110,22 +110,22 @@ endif
 
 # Storage engine specific compilation options
 ha_ndbcluster.o:ha_ndbcluster.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_push.o:ha_ndbcluster_push.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_connection.o: ha_ndbcluster_connection.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 ha_ndbinfo.o: ha_ndbinfo.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 # Until we can remove dependency on ha_ndbcluster.h
 handler.o:	handler.cc

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2011-03-30 09:30:25 +0000
+++ b/sql/Makefile.am	2011-03-30 10:54:30 +0000
@@ -134,7 +134,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 
 nodist_mysqld_SOURCES =	mini_client_errors.c pack.c client.c my_time.c my_user.c 
 
-libndb_la_CPPFLAGS=	@ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src
+libndb_la_CPPFLAGS=	@ndbcluster_includes@
 libndb_la_SOURCES=	ha_ndbcluster.cc \
 			ha_ndbcluster_binlog.cc \
 			ha_ndbcluster_connection.cc \

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-30 09:32:00 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-30 10:54:30 +0000
@@ -38,8 +38,8 @@
 #include <util/Bitmask.hpp>
 #include <ndbapi/NdbIndexStat.hpp>
 #include <ndbapi/NdbInterpretedCode.hpp>
-#include <ndbapi/NdbQueryBuilder.hpp>
-#include <ndbapi/NdbQueryOperation.hpp>
+#include "../storage/ndb/src/ndbapi/NdbQueryBuilder.hpp"
+#include "../storage/ndb/src/ndbapi/NdbQueryOperation.hpp"
 
 #include "ha_ndbcluster_binlog.h"
 #include "ha_ndbcluster_push.h"

=== modified file 'sql/ha_ndbcluster_push.cc'
--- a/sql/ha_ndbcluster_push.cc	2011-02-08 12:17:17 +0000
+++ b/sql/ha_ndbcluster_push.cc	2011-03-30 10:54:30 +0000
@@ -38,8 +38,8 @@
 #include <util/Bitmask.hpp>
 #include <ndbapi/NdbIndexStat.hpp>
 #include <ndbapi/NdbInterpretedCode.hpp>
-#include <ndbapi/NdbQueryBuilder.hpp>
-#include <ndbapi/NdbQueryOperation.hpp>
+#include "../storage/ndb/src/ndbapi/NdbQueryBuilder.hpp"
+#include "../storage/ndb/src/ndbapi/NdbQueryOperation.hpp"
 
 #include "ha_ndbcluster_binlog.h"
 #include "ha_ndbcluster_tables.h"

=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am	2011-03-30 09:30:25 +0000
+++ b/storage/ndb/test/tools/Makefile.am	2011-03-30 10:54:30 +0000
@@ -46,15 +46,12 @@ test_spj_CXXFLAGS = -I$(top_srcdir)/stor
         -I$(top_srcdir)/storage/ndb/include/ndbapi \
         -I$(top_srcdir)/storage/ndb/include/util \
 	-I$(top_srcdir)/storage/ndb/include/portlib \
-	-I$(top_srcdir)/storage/ndb/include/logger \
-	-I$(top_srcdir)/storage/ndb/src/ndbapi
+	-I$(top_srcdir)/storage/ndb/include/logger
 
 spj_sanity_test_SOURCES = spj_sanity_test.cpp
 spj_sanity_test_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-spj_sanity_test_CXXFLAGS= -I$(top_srcdir)/storage/ndb/src/ndbapi
 spj_performance_test_SOURCES = spj_performance_test.cpp
 spj_performance_test_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-spj_performance_test_CXXFLAGS= -I$(top_srcdir)/storage/ndb/src/ndbapi
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am

=== modified file 'storage/ndb/test/tools/spj_performance_test.cpp'
--- a/storage/ndb/test/tools/spj_performance_test.cpp	2010-11-23 10:05:44 +0000
+++ b/storage/ndb/test/tools/spj_performance_test.cpp	2011-03-30 10:54:30 +0000
@@ -9,8 +9,8 @@
 #include <ndb_opts.h>
 #include <NDBT.hpp>
 #include <NdbApi.hpp>
-#include <NdbQueryOperation.hpp>
-#include <NdbQueryBuilder.hpp>
+#include "../../src/ndbapi/NdbQueryOperation.hpp"
+#include "../../src/ndbapi/NdbQueryBuilder.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-02-04 08:45:18 +0000
+++ b/storage/ndb/test/tools/spj_sanity_test.cpp	2011-03-30 10:54:30 +0000
@@ -7,8 +7,8 @@
 #include <ndb_opts.h>
 #include <NDBT.hpp>
 #include <NdbApi.hpp>
-#include <NdbQueryOperation.hpp>
-#include <NdbQueryBuilder.hpp>
+#include "../../src/ndbapi/NdbQueryOperation.hpp"
+#include "../../src/ndbapi/NdbQueryBuilder.hpp"
 
 /* TODO:
  - RecAttr and setResultRowBuff result retrieval.


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