bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3458 to 3460)

[jonas oreland]

 3460 jonas oreland	2011-03-30
      ndb - enable join_pushdown by default in >= 7.2.0

    modified:
      sql/ha_ndbcluster.cc
 3459 jonas oreland	2011-03-30
      ndb - move NdbQuery* into storage/ndb/src/ndbapi for now

    renamed:
      storage/ndb/include/ndbapi/NdbQueryBuilder.hpp => storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/include/ndbapi/NdbQueryOperation.hpp => storage/ndb/src/ndbapi/NdbQueryOperation.hpp
    modified:
      libmysqld/Makefile.am
      sql/Makefile.am
      storage/ndb/include/Makefile.am
      storage/ndb/test/include/HugoQueries.hpp
      storage/ndb/test/include/HugoQueryBuilder.hpp
      storage/ndb/test/src/HugoQueries.cpp
      storage/ndb/test/tools/Makefile.am
 3458 Ole John Aske	2011-03-30
      SPJ: Fixed error handling in ::closeTcCursor() while waiting for a cursor to be (forcefully) closed
      
      If there was a node failure while waiting for close to be confirmed, we would call
      setFetchTerminated() twice - which is an error and would cause an assert to fire.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2011-01-18 08:17:07 +0000
+++ b/libmysqld/Makefile.am	2011-03-30 09:30:25 +0000
@@ -110,22 +110,22 @@ endif
 
 # Storage engine specific compilation options
 ha_ndbcluster.o:ha_ndbcluster.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_push.o:ha_ndbcluster_push.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
 
 ha_ndbcluster_connection.o: ha_ndbcluster_connection.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(LM_CFLAGS) -c $<
 
 ha_ndbinfo.o: ha_ndbinfo.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src $(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-01-18 08:17:07 +0000
+++ b/sql/Makefile.am	2011-03-30 09:30:25 +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@
+libndb_la_CPPFLAGS=	@ndbcluster_includes@ -I$(top_srcdir)/storage/ndb/src
 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-29 19:12:09 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-30 09:32:00 +0000
@@ -256,7 +256,11 @@ static MYSQL_THDVAR_BOOL(
   "Enable pushing down of join to datanodes",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
+#if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
   FALSE                              /* default */
+#else
+  TRUE
+#endif
 );
 
 /*

=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am	2011-02-04 11:45:24 +0000
+++ b/storage/ndb/include/Makefile.am	2011-03-30 09:30:25 +0000
@@ -31,8 +31,6 @@ ndbapi/NdbDictionary.hpp \
 ndbapi/NdbError.hpp \
 ndbapi/NdbEventOperation.hpp \
 ndbapi/NdbIndexOperation.hpp \
-ndbapi/NdbQueryOperation.hpp \
-ndbapi/NdbQueryBuilder.hpp \
 ndbapi/NdbOperation.hpp \
 ndbapi/ndb_cluster_connection.hpp \
 ndbapi/NdbBlob.hpp \

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

=== modified file 'storage/ndb/test/include/HugoQueryBuilder.hpp'
--- a/storage/ndb/test/include/HugoQueryBuilder.hpp	2010-11-09 13:03:09 +0000
+++ b/storage/ndb/test/include/HugoQueryBuilder.hpp	2011-03-30 09:30:25 +0000
@@ -21,7 +21,7 @@
 
 #include <NDBT.hpp>
 #include <Vector.hpp>
-#include <NdbQueryBuilder.hpp>
+#include "../../src/ndbapi/NdbQueryBuilder.hpp"
 
 class HugoQueryBuilder {
 public:

=== modified file 'storage/ndb/test/src/HugoQueries.cpp'
--- a/storage/ndb/test/src/HugoQueries.cpp	2010-11-09 13:03:09 +0000
+++ b/storage/ndb/test/src/HugoQueries.cpp	2011-03-30 09:30:25 +0000
@@ -20,7 +20,7 @@
 #include <NDBT_Stats.hpp>
 #include <NdbSleep.h>
 #include <NdbTick.h>
-#include <NdbQueryOperation.hpp>
+#include "../../src/ndbapi/NdbQueryOperation.hpp"
 
 HugoQueries::HugoQueries(const NdbQueryDef & query)
 {

=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am	2011-02-08 15:06:35 +0000
+++ b/storage/ndb/test/tools/Makefile.am	2011-03-30 09:30:25 +0000
@@ -46,12 +46,15 @@ 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/include/logger \
+	-I$(top_srcdir)/storage/ndb/src/ndbapi
 
 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

No bundle (reason: useless for push emails).