Commit 1ccf00f0 authored by pekka@sama.ndb.mysql.com's avatar pekka@sama.ndb.mysql.com
Browse files

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107 

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
parents aa9a3a69 e2f23fb8

mysql-test/suite/ndb/r/ndb_condition_pushdown.result

+6 −0
Original line number Diff line number Diff line
@@ -1904,6 +1904,12 @@ a b d 
10	1	4369

20	2	8738

50	5	21845

-- big filter just below limit

a	b	d

10	1	4369

20	2	8738

50	5	21845

-- big filter just above limit

a	b	d

10	1	4369

20	2	8738

mysql-test/suite/ndb/t/ndb_condition_pushdown.test

+12 −739

File changed.

Preview size limit exceeded, changes collapsed.

storage/ndb/include/ndbapi/ndbapi_limits.h

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define NDB_MAX_TUPLE_SIZE (NDB_MAX_TUPLE_SIZE_IN_WORDS*4)

#define NDB_MAX_ACTIVE_EVENTS 100



#define NDB_MAX_SCANFILTER_SIZE_IN_WORDS 50000

/* TUP ZATTR_BUFFER_SIZE 16384 (minus 1) minus place for getValue()s */

#define NDB_MAX_SCANFILTER_SIZE_IN_WORDS (16384 - 1 - 1024)



#endif

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+3 −1
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ inline const Uint32* ALIGN_WORD(const void* ptr) 
#define ZUNSUPPORTED_BRANCH 892



#define ZSTORED_SEIZE_ATTRINBUFREC_ERROR 873 // Part of Scan

#define ZSTORED_TOO_MUCH_ATTRINFO_ERROR 874



#define ZREAD_ONLY_CONSTRAINT_VIOLATION 893

#define ZVAR_SIZED_NOT_SUPPORTED 894
@@ -2539,7 +2540,8 @@ private: 
                     Operationrec* regOperPtr,

                     Uint32 lenAttrInfo);

  void storedSeizeAttrinbufrecErrorLab(Signal* signal,

                                       Operationrec* regOperPtr);

                                       Operationrec* regOperPtr,

                                       Uint32 errorCode);

  bool storedProcedureAttrInfo(Signal* signal,

                               Operationrec* regOperPtr,

			       const Uint32* data,

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+11 −3
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ void Dbtup::copyAttrinfo(Operationrec * regOperPtr, 
    RbufLen = copyAttrBufPtr.p->attrbuf[ZBUF_DATA_LEN];

    Rnext = copyAttrBufPtr.p->attrbuf[ZBUF_NEXT];

    Rfirst = cfirstfreeAttrbufrec;

    /*

     * ATTRINFO comes from 2 mutually exclusive places:

     * 1) TUPKEYREQ (also interpreted part)

     * 2) STORED_PROCREQ before scan start

     * Assert here that both have a check for overflow.

     * The "<" instead of "<=" is intentional.

     */

    ndbrequire(RinBufIndex + RbufLen < ZATTR_BUFFER_SIZE);

    MEMCOPY_NO_WORDS(&inBuffer[RinBufIndex],

                     &copyAttrBufPtr.p->attrbuf[0],

                     RbufLen);