3421 Jonas Oreland 2011-02-08 [merge]
ndb - merge 70-mainline into 70-spj-scan-scan again
modified:
storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
3420 Jonas Oreland 2011-02-08
ndb spj - remove pointless changes to files
modified:
storage/ndb/config/type_ndbapitest.mk.am
storage/ndb/src/ndbapi/NdbOperation.cpp
storage/ndb/src/ndbapi/NdbOperationExec.cpp
storage/ndb/src/ndbapi/NdbRecord.hpp
storage/ndb/test/tools/Makefile.am
3419 Jonas Oreland 2011-02-08 [merge]
ndb - merge 70-spj-scan-scan
modified:
mysql-test/suite/ndb/r/ndb_join_pushdown.result
mysql-test/suite/ndb/t/ndb_join_pushdown.test
sql/ha_ndbcluster_push.cc
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
storage/ndb/src/ndbapi/TransporterFacade.cpp
storage/ndb/src/ndbapi/ndberror.c
=== modified file 'storage/ndb/config/type_ndbapitest.mk.am'
--- a/storage/ndb/config/type_ndbapitest.mk.am 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/config/type_ndbapitest.mk.am 2011-02-08 15:06:35 +0000
@@ -18,7 +18,6 @@ LDADD += $(top_builddir)/storage/ndb/tes
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/mysys/libmysyslt.la \
- $(top_builddir)/libmysql/.libs/libmysqlclient.a \
$(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@
INCLUDES += -I$(top_srcdir) \
=== modified file 'storage/ndb/src/ndbapi/NdbInterpretedCode.cpp'
--- a/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp 2011-02-08 15:13:13 +0000
@@ -963,7 +963,7 @@ NdbInterpretedCode::getWordsUsed() const
}
-int
+int
NdbInterpretedCode::copy(const NdbInterpretedCode& src)
{
m_table_impl = src.m_table_impl;
@@ -991,7 +991,7 @@ NdbInterpretedCode::copy(const NdbInterp
return 4000; // Alllocation failed.
}
memcpy(m_internal_buffer,
- src.m_internal_buffer,
+ src.m_internal_buffer,
m_buffer_length*sizeof(Uint32));
}
=== modified file 'storage/ndb/src/ndbapi/NdbOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbOperation.cpp 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp 2011-02-08 15:06:35 +0000
@@ -76,7 +76,6 @@ NdbOperation::NdbOperation(Ndb* aNdb, Nd
theError.code = 0;
m_customData = NULL;
}
-
/*****************************************************************************
* ~NdbOperation();
*
@@ -192,6 +191,7 @@ NdbOperation::init(const NdbTableImpl* t
theATTRINFOptr = &tcKeyReq->attrInfo[0];
if (theReceiver.init(NdbReceiver::NDB_OPERATION, useRec, this))
{
+ // theReceiver sets the error code of its owner
return -1;
}
m_customData = NULL;
=== modified file 'storage/ndb/src/ndbapi/NdbOperationExec.cpp'
--- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp 2011-02-08 15:06:35 +0000
@@ -451,7 +451,6 @@ NdbOperation::prepareSend(Uint32 aTC_Con
tcKeyReq->apiConnectPtr = aTC_ConnectPtr;
tcKeyReq->apiOperationPtr = ptr2int();
-
// Check if too much attrinfo have been defined
if (tTotalCurrAI_Len > TcKeyReq::MaxTotalAttrInfo){
setErrorCodeAbort(4257);
@@ -1426,6 +1425,7 @@ NdbOperation::prepareSendNdbRecord(Abort
theStatus= WaitResponse;
theReceiver.prepareSend();
+
return 0;
}
=== modified file 'storage/ndb/src/ndbapi/NdbRecord.hpp'
--- a/storage/ndb/src/ndbapi/NdbRecord.hpp 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/NdbRecord.hpp 2011-02-08 15:06:35 +0000
@@ -19,10 +19,6 @@
#ifndef NdbRecord_H
#define NdbRecord_H
-#include <Bitmask.hpp>
-#include <NdbSqlUtil.hpp>
-#include <ndbapi_limits.h>
-
class NdbRecord {
public:
/* Flag bits for the entire NdbRecord. */
=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am 2011-02-04 11:45:24 +0000
+++ b/storage/ndb/test/tools/Makefile.am 2011-02-08 15:06:35 +0000
@@ -49,7 +49,9 @@ test_spj_CXXFLAGS = -I$(top_srcdir)/stor
-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_performance_test_SOURCES = spj_performance_test.cpp
+spj_performance_test_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
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).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3419 to3421) | Jonas Oreland | 8 Feb |
