List:Commits« Previous MessageNext Message »
From:jonas oreland Date:March 30 2011 11:31am
Subject:bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3460 to
3465)
View as plain text  
 3465 jonas oreland	2011-03-30
      ndb spj - undelete files that was accidently deleted (by me) during merge

    added:
      storage/ndb/src/mgmapi/test/Makefile
      storage/ndb/test/newtonapi/basic_test/Makefile
      storage/ndb/test/newtonapi/basic_test/basic/Makefile
      storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile
      storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile
      storage/ndb/test/newtonapi/perf_test/Makefile
      storage/ndb/test/odbc/SQL99_test/Makefile
      storage/ndb/test/odbc/client/Makefile
      storage/ndb/test/odbc/dm-iodbc/Makefile
      storage/ndb/test/odbc/dm-unixodbc/Makefile
      storage/ndb/test/odbc/driver/Makefile
      storage/ndb/test/odbc/test_compiler/Makefile
 3464 jonas oreland	2011-03-30
      ndb - change #ifdef 7.2 as forte is poor at nested macros

    modified:
      sql/ha_ndbcluster.cc
 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
 3462 jonas oreland	2011-03-30
      ndb spj - remove testcase that had been merged in as duplicate

    modified:
      mysql-test/r/join_outer.result
      mysql-test/t/join_outer.test
 3461 jonas oreland	2011-03-30
      ndb spj - remove 70-main diff

    modified:
      mysql-test/r/partition.result
      mysql-test/t/partition.test
 3460 jonas oreland	2011-03-30
      ndb - enable join_pushdown by default in >= 7.2.0

    modified:
      sql/ha_ndbcluster.cc
=== 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 'mysql-test/r/join_outer.result'
--- a/mysql-test/r/join_outer.result	2011-02-02 15:16:35 +0000
+++ b/mysql-test/r/join_outer.result	2011-03-30 10:06:55 +0000
@@ -1398,50 +1398,6 @@ Warnings:
 Note	1003	select straight_join `test`.`jt1`.`f1` AS `f1` from `test`.`t1` `jt6` left join (`test`.`t1` `jt3` join `test`.`t1` `jt4` left join `test`.`t1` `jt5` on(1) left join `test`.`t1` `jt2` on(1)) on((`test`.`jt6`.`f1` and 1)) left join `test`.`t1` `jt1` on(1) where 1
 DROP TABLE t1;
 #
-# Bug#58490: Incorrect result in multi level OUTER JOIN 
-# in combination with IS NULL 
-#
-CREATE TABLE t1 (i INT NOT NULL);
-INSERT INTO t1 VALUES (0),    (2),(3),(4);
-CREATE TABLE t2 (i INT NOT NULL);
-INSERT INTO t2 VALUES (0),(1),    (3),(4);
-CREATE TABLE t3 (i INT NOT NULL);
-INSERT INTO t3 VALUES (0),(1),(2),    (4);
-CREATE TABLE t4 (i INT NOT NULL);
-INSERT INTO t4 VALUES (0),(1),(2),(3)   ;
-SELECT * FROM
-t1 LEFT JOIN
-( t2 LEFT JOIN
-( t3 LEFT JOIN 
-t4
-ON t4.i = t3.i
-)
-ON t3.i = t2.i
-)
-ON t2.i = t1.i
-;
-i	i	i	i
-0	0	0	0
-2	NULL	NULL	NULL
-3	3	NULL	NULL
-4	4	4	NULL
-SELECT * FROM
-t1 LEFT JOIN
-( t2 LEFT JOIN
-( t3 LEFT JOIN 
-t4
-ON t4.i = t3.i
-)
-ON t3.i = t2.i
-)
-ON t2.i = t1.i
-WHERE t4.i IS NULL;
-i	i	i	i
-2	NULL	NULL	NULL
-3	3	NULL	NULL
-4	4	4	NULL
-DROP TABLE t1,t2,t3,t4;
-#
 # Bug#57034 incorrect OUTER JOIN result when joined on unique key
 #
 CREATE TABLE t1 (pk INT PRIMARY KEY, 

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2011-03-23 14:07:43 +0000
+++ b/mysql-test/r/partition.result	2011-03-30 10:03:32 +0000
@@ -1563,8 +1563,8 @@ insert into t1 values (18446744073709551
 select * from t1;
 a
 18446744073709551612
-18446744073709551613
 18446744073709551614
+18446744073709551613
 18446744073709551615
 select * from t1 where a = 18446744073709551615;
 a
@@ -1573,8 +1573,8 @@ delete from t1 where a = 184467440737095
 select * from t1;
 a
 18446744073709551612
-18446744073709551613
 18446744073709551614
+18446744073709551613
 drop table t1;
 CREATE TABLE t1 (
 num int(11) NOT NULL, cs int(11) NOT NULL)

=== modified file 'mysql-test/t/join_outer.test'
--- a/mysql-test/t/join_outer.test	2011-02-02 15:16:35 +0000
+++ b/mysql-test/t/join_outer.test	2011-03-30 10:06:55 +0000
@@ -982,46 +982,6 @@ EXPLAIN EXTENDED SELECT STRAIGHT_JOIN jt
 DROP TABLE t1;
 
 --echo #
---echo # Bug#58490: Incorrect result in multi level OUTER JOIN 
---echo # in combination with IS NULL 
---echo #
-
-CREATE TABLE t1 (i INT NOT NULL);
-INSERT INTO t1 VALUES (0),    (2),(3),(4);
-CREATE TABLE t2 (i INT NOT NULL);
-INSERT INTO t2 VALUES (0),(1),    (3),(4);
-CREATE TABLE t3 (i INT NOT NULL);
-INSERT INTO t3 VALUES (0),(1),(2),    (4);
-CREATE TABLE t4 (i INT NOT NULL);
-INSERT INTO t4 VALUES (0),(1),(2),(3)   ;
-
-SELECT * FROM
- t1 LEFT JOIN
- ( t2 LEFT JOIN
-   ( t3 LEFT JOIN 
-     t4
-     ON t4.i = t3.i
-   )
-   ON t3.i = t2.i
- )
- ON t2.i = t1.i
- ;
-
-SELECT * FROM
- t1 LEFT JOIN
- ( t2 LEFT JOIN
-   ( t3 LEFT JOIN 
-     t4
-     ON t4.i = t3.i
-   )
-   ON t3.i = t2.i
- )
- ON t2.i = t1.i
- WHERE t4.i IS NULL;
-
-DROP TABLE t1,t2,t3,t4;
-
---echo #
 --echo # Bug#57034 incorrect OUTER JOIN result when joined on unique key
 --echo #
 

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2010-10-21 07:23:57 +0000
+++ b/mysql-test/t/partition.test	2011-03-30 10:03:32 +0000
@@ -1556,11 +1556,9 @@ partitions 10;
 show create table t1;
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),
 (18446744073709551613), (18446744073709551612);
---sorted_result
 select * from t1;
 select * from t1 where a = 18446744073709551615;
 delete from t1 where a = 18446744073709551615;
---sorted_result
 select * from t1;
 drop table t1;
 

=== 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 11:28:05 +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"
@@ -250,19 +250,25 @@ static MYSQL_THDVAR_UINT(
   0                                  /* block */
 );
 
+#if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
 static MYSQL_THDVAR_BOOL(
   join_pushdown,                     /* name */
   PLUGIN_VAR_OPCMDARG,
   "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
+static MYSQL_THDVAR_BOOL(
+  join_pushdown,                     /* name */
+  PLUGIN_VAR_OPCMDARG,
+  "Enable pushing down of join to datanodes",
+  NULL,                              /* check func. */
+  NULL,                              /* update func. */
+  TRUE                               /* default */
 );
-
+#endif
 /*
   Default value for max number of transactions createable against NDB from
   the handler. Should really be 2 but there is a transaction to much allocated

=== 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"

=== added file 'storage/ndb/src/mgmapi/test/Makefile'
--- a/storage/ndb/src/mgmapi/test/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/mgmapi/test/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,13 @@
+include .defs.mk
+
+TYPE := mgmapiclient util
+
+BIN_TARGET  := testMgmapi 
+
+CCFLAGS_LOC += -I$(call fixpath,$(NDB_TOP)/src/common/mgmcommon) 
+#-I$(NDB_TOP)/include/util -I$(NDB_TOP)/include/portlib
+
+# Source files of non-templated classes (.C files)
+SOURCES = keso.cpp
+
+include $(NDB_TOP)/Epilogue.mk

=== added file 'storage/ndb/test/newtonapi/basic_test/Makefile'
--- a/storage/ndb/test/newtonapi/basic_test/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/newtonapi/basic_test/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,25 @@
+include .defs.mk
+
+TYPE := util
+
+PIC_ARCHIVE := Y
+ARCHIVE_TARGET := newtonbasictestcommon
+
+A_LIB       := Y
+SO_LIB      := Y
+PIC_LIB     := Y
+
+LIB_TARGET  := NEWTON_BASICTEST_COMMON
+LIB_TARGET_ARCHIVES := $(ARCHIVE_TARGET) NEWTON_API
+
+
+SOURCES = common.cpp
+
+DIRS := basic \
+        ptr_binding \
+        bulk_read
+
+CCFLAGS_LOC := -I$(call fixpath,$(NDB_TOP)/include/util) -I$(call fixpath,$(NDB_TOP)/include/newtonapi)
+
+include $(NDB_TOP)/Epilogue.mk
+

=== added file 'storage/ndb/test/newtonapi/basic_test/basic/Makefile'
--- a/storage/ndb/test/newtonapi/basic_test/basic/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/newtonapi/basic_test/basic/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,14 @@
+include .defs.mk
+
+TYPE := ndbapitest
+
+BIN_TARGET := newton_basic
+BIN_TARGET_LIBS :=
+BIN_TARGET_ARCHIVES := NEWTON_BASICTEST_COMMON NEWTON_API
+SOURCES    := basic.cpp
+
+CCFLAGS_LOC := -I.. -I$(call fixpath,$(NDB_TOP)/include/util) -I$(call fixpath,$(NDB_TOP)/include/newtonapi) -I$(call fixpath,$(NDB_TOP)/include/portlib)
+
+include $(NDB_TOP)/Epilogue.mk
+
+

=== added file 'storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile'
--- a/storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,14 @@
+include .defs.mk
+
+TYPE := ndbapitest
+
+BIN_TARGET := newton_br
+BIN_TARGET_LIBS :=
+BIN_TARGET_ARCHIVES := NEWTON_BASICTEST_COMMON NEWTON_API
+SOURCES    := br_test.cpp
+
+CCFLAGS_LOC := -I.. -I$(call fixpath,$(NDB_TOP)/include/util) -I$(call fixpath,$(NDB_TOP)/include/newtonapi) -I$(call fixpath,$(NDB_TOP)/include/portlib)
+
+include $(NDB_TOP)/Epilogue.mk
+
+

=== added file 'storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile'
--- a/storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,14 @@
+include .defs.mk
+
+TYPE := ndbapitest
+
+BIN_TARGET := newton_pb
+BIN_TARGET_LIBS :=
+BIN_TARGET_ARCHIVES := NEWTON_BASICTEST_COMMON NEWTON_API
+SOURCES    := ptr_binding_test.cpp
+
+CCFLAGS_LOC := -I.. -I$(call fixpath,$(NDB_TOP)/include/util) -I$(call fixpath,$(NDB_TOP)/include/newtonapi) -I$(call fixpath,$(NDB_TOP)/include/portlib)
+
+include $(NDB_TOP)/Epilogue.mk
+
+

=== added file 'storage/ndb/test/newtonapi/perf_test/Makefile'
--- a/storage/ndb/test/newtonapi/perf_test/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/newtonapi/perf_test/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,14 @@
+include .defs.mk
+
+TYPE := ndbapitest
+
+BIN_TARGET := newton_perf
+BIN_TARGET_LIBS :=
+BIN_TARGET_ARCHIVES := NEWTON_API
+SOURCES    := perf.cpp
+
+CCFLAGS_LOC := -I$(call fixpath,$(NDB_TOP)/include/util) -I$(call fixpath,$(NDB_TOP)/include/newtonapi) -I$(call fixpath,$(NDB_TOP)/include/portlib)
+
+include $(NDB_TOP)/Epilogue.mk
+
+

=== added file 'storage/ndb/test/odbc/SQL99_test/Makefile'
--- a/storage/ndb/test/odbc/SQL99_test/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/SQL99_test/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,26 @@
+include .defs.mk
+
+TYPE =                  odbcdriver
+
+BIN_TARGET =            SQL99_test
+
+SOURCES =               SQL99_test.cpp
+
+CCFLAGS_LOC += 			-I/usr/local/include \
+				        -I$(NDB_TOP)/test/include \
+						-I$(NDB_TOP)/include \
+                        -I$(NDB_TOP)/src/client/odbc/common
+
+
+CCFLAGS_WARNINGS +=     -Wno-unused
+
+LIBS_SPEC += \
+						-lNDBT \
+						-lodbc \
+						-lodbcinst \
+						-lportlib
+
+
+
+include $(NDB_TOP)/Epilogue.mk
+

=== added file 'storage/ndb/test/odbc/client/Makefile'
--- a/storage/ndb/test/odbc/client/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/client/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,95 @@
+include .defs.mk
+
+TYPE :=		odbcclient
+#TYPE :=	odbcdriver
+
+BIN_TARGET :=	testOdbcClient
+#BIN_TARGET :=	testodbc2
+
+
+# Source files of non-templated classes (.C files)
+SOURCES =	main.cpp \
+		SQLFetchTest.cpp \
+		SQLDisconnectTest.cpp \
+		SQLTablesTest.cpp \
+		SQLGetInfoTest.cpp \
+		SQLGetTypeInfoTest.cpp \
+		SQLGetFunctionsTest.cpp \
+		SQLGetDataTest.cpp \
+		SQLCancelTest.cpp \
+		SQLTransactTest.cpp \
+		SQLGetCursorNameTest.cpp \
+		SQLSetCursorNameTest.cpp \
+		SQLRowCountTest.cpp \
+		SQLNumResultColsTest.cpp \
+		SQLDescribeColTest.cpp \
+		SQLExecDirectTest.cpp \
+		SQLColAttributeTest.cpp \
+		SQLColAttributeTest1.cpp \
+		SQLColAttributeTest2.cpp \
+		SQLColAttributeTest3.cpp \
+		SQLBindColTest.cpp \
+		SQLDriverConnectTest.cpp \
+		SQLPrepareTest.cpp \
+		SQLGetDiagRecSimpleTest.cpp \
+		SQLConnectTest.cpp
+
+XSOURCES =	testodbc2.cpp
+XSOURCES = \
+		main.cpp \
+		SQLDriverConnectTest.cpp \
+		SQLPrepareTest.cpp \
+		SQLMoreResultsTest.cpp \
+		SQLGetStmtAttrTest.cpp \
+		SQLGetEnvAttrTest.cpp \
+		SQLGetConnectAttrTest.cpp \
+		SQLExecuteTest.cpp \
+		SQLExecDirectTest.cpp \
+		SQLDisconnectTest.cpp \
+		SQLCloseCursorTest.cpp \
+		SQLCancelTest.cpp \
+		SQLBindColTest.cpp \
+		SQLDescribeColTest.cpp \
+		SQLGetTypeInfoTest.cpp \
+		SQLGetFunctionsTest.cpp \
+		SQLNumResultColsTest.cpp \
+		SQLSetDescFieldTest.cpp \
+		SQLGetDescRecTest.cpp \
+		SQLEndTranTest.cpp \
+		SQLGetInfoTest.cpp \
+		SQLConnectTest.cpp \
+		SQLAllocHandleTest.cpp \
+		SQLAllocEnvTest.cpp \
+		SQLRowCountTest.cpp \
+		SQLFetchScrollTest.cpp \
+		SQLFetchTest.cpp \
+		SQLGetDescFieldTest.cpp \
+		SQLSetDescRecTest.cpp \
+		SQLFreeHandleTest.cpp
+
+ifeq ($(TYPE),odbcdriver)
+LIBS_SPEC += \
+		-lodbcdriver_pic \
+		-lodbchandles_pic \
+		-lodbccodegen_pic \
+		-lodbccompiler_pic \
+		-lodbcexecutor_pic \
+		-lodbccommon_pic \
+		-lodbcdictionary_pic \
+		-lNDBT \
+		-lportlib
+endif
+
+ifeq ($(TYPE),odbcclient)
+LIBS_SPEC += \
+		-lportlib \
+		-lNDBT 
+endif
+
+CCFLAGS_LOC += 	-I/usr/local/include \
+	        -I$(NDB_TOP)/include/ndbapi \
+		-I$(NDB_TOP)/test/include
+
+include $(NDB_TOP)/Epilogue.mk
+#LIBS_LOC +=	-L/usr/local/opt/iODBC/lib
+#LIBS_SPEC =	-liodbc -lNDBT -lportlib

=== added file 'storage/ndb/test/odbc/dm-iodbc/Makefile'
--- a/storage/ndb/test/odbc/dm-iodbc/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/dm-iodbc/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,38 @@
+include .defs.mk
+
+TYPE =			*
+
+BIN_TARGET =		testOdbcDMi
+
+SOURCES =		testOdbcDMi.cpp
+
+CCFLAGS_LOC += \
+			-I$(NDB_TOP)/include \
+			-I$(NDB_TOP)/include/ndbapi \
+			-I$(NDB_TOP)/include/portlib \
+			-I$(NDB_TOP)/include/util \
+			-I$(NDB_TOP)/test/include
+
+CCFLAGS_WARNINGS +=	-Wno-unused -Wno-sign-compare
+
+CCFLAGS_TOP +=		-DHAVE_LONG_LONG -DiODBC
+
+BIN_TARGET_LIBS =	NDBT general portlib
+
+ifeq ($(NDB_OS),SOLARIS)
+CCFLAGS_TOP +=		-DDMALLOC
+LIBS_LOC +=		-L/usr/local/opt/iODBC/lib
+LIBS_LOC +=		-R/usr/local/opt/iODBC/lib
+BIN_TARGET_LIBS +=	iodbc
+BIN_TARGET_LIBS +=	dmallocthcxx
+endif
+
+ifeq ($(NDB_OS),LINUX)
+BIN_TARGET_LIBS_DIRS +=	/usr/local/opt/iODBC/lib
+BIN_TARGET_LIBS +=	iodbc
+endif
+
+include $(NDB_TOP)/Epilogue.mk
+
+testOdbcDMi.cpp:
+	ln -s ../driver/testOdbcDriver.cpp $@

=== added file 'storage/ndb/test/odbc/dm-unixodbc/Makefile'
--- a/storage/ndb/test/odbc/dm-unixodbc/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/dm-unixodbc/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,39 @@
+include .defs.mk
+
+TYPE =			*
+
+BIN_TARGET =		testOdbcDMu
+
+SOURCES =		testOdbcDMu.cpp
+
+CCFLAGS_LOC += \
+			-I$(NDB_TOP)/include \
+			-I$(NDB_TOP)/include/ndbapi \
+			-I$(NDB_TOP)/include/portlib \
+			-I$(NDB_TOP)/include/util \
+			-I$(NDB_TOP)/test/include
+
+CCFLAGS_WARNINGS +=	-Wno-unused -Wno-sign-compare
+
+CCFLAGS_TOP +=		-DHAVE_LONG_LONG -DunixODBC
+
+BIN_TARGET_LIBS =	NDBT general portlib
+
+ifeq ($(NDB_OS),SOLARIS)
+CCFLAGS_TOP +=		-DDMALLOC
+LIBS_LOC +=		-L/usr/local/lib
+BIN_TARGET_LIBS +=	odbc odbcinst
+BIN_TARGET_LIBS +=	dmallocthcxx
+endif
+
+ifeq ($(NDB_OS),LINUX)
+BIN_TARGET_LIBS +=	odbc odbcinst
+BIN_TARGET_LIBS_DIRS +=	.
+dummy := $(shell [ ! -f /usr/lib/libodbc.so ] || ln -sf /usr/lib/libodbc.so.1 libodbc.so)
+dummy := $(shell [ ! -f /usr/lib/libodbcinst.so ] || ln -sf /usr/lib/libodbcinst.so.1 libodbcinst.so)
+endif
+
+include $(NDB_TOP)/Epilogue.mk
+
+testOdbcDMu.cpp:
+	ln -s ../driver/testOdbcDriver.cpp $@

=== added file 'storage/ndb/test/odbc/driver/Makefile'
--- a/storage/ndb/test/odbc/driver/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/driver/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,30 @@
+include .defs.mk
+
+TYPE =			*
+
+BIN_TARGET =		testOdbcDriver
+
+SOURCES =		testOdbcDriver.cpp
+
+CCFLAGS_LOC += \
+			-I$(NDB_TOP)/include \
+			-I$(NDB_TOP)/include/ndbapi \
+			-I$(NDB_TOP)/include/portlib \
+			-I$(NDB_TOP)/include/util \
+			-I$(NDB_TOP)/test/include \
+			-I/usr/local/include
+
+CCFLAGS_WARNINGS +=	-Wno-unused -Wno-sign-compare -Wformat
+
+CCFLAGS_TOP +=		-DHAVE_LONG_LONG -DndbODBC
+
+BIN_TARGET_LIBS =	 NDBT NDB_ODBC
+
+ifeq ($(NDB_OS),SOLARIS)
+BIN_TARGET_LIBS +=	dmallocthcxx
+CCFLAGS_TOP +=		-DDMALLOC
+endif
+
+include $(NDB_TOP)/Epilogue.mk
+
+$(BIN_DIR)$(BIN_TARGET): Makefile

=== added file 'storage/ndb/test/odbc/test_compiler/Makefile'
--- a/storage/ndb/test/odbc/test_compiler/Makefile	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/odbc/test_compiler/Makefile	2011-03-30 11:30:05 +0000
@@ -0,0 +1,21 @@
+include .defs.mk
+
+TYPE =                  odbcdriver
+
+BIN_TARGET =            test_compiler
+
+SOURCES =               test_compiler.cpp
+
+CCFLAGS_LOC += \
+                        -I$(NDB_TOP)/src/client/odbc/common \
+			-I$(NDB_TOP)/src/client/odbc/dictionary \
+			-I$(NDB_TOP)/src/client/odbc/compiler
+
+CCFLAGS_WARNINGS +=     -Wno-unused
+
+LIBS_SPEC += \
+                        -lodbccompiler_pic
+
+
+include $(NDB_TOP)/Epilogue.mk
+

=== 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.

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3460 to3465) jonas oreland30 Mar