diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index fb38218dc8c..b9e4478dd1a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -95,6 +95,7 @@ jcole@tetra.spaceapes.com jimw@mysql.com joerg@mysql.com jon@gigan. +joreland@bk-internal.mysql.com joreland@mysql.com jorge@linux.jorge.mysql.com jplindst@t41.(none) diff --git a/ndb/include/kernel/signaldata/CreateTable.hpp b/ndb/include/kernel/signaldata/CreateTable.hpp index 67e510d2ed0..481b323fdb0 100644 --- a/ndb/include/kernel/signaldata/CreateTable.hpp +++ b/ndb/include/kernel/signaldata/CreateTable.hpp @@ -86,6 +86,7 @@ public: NoMoreAttributeRecords = 708, AttributeNameTwice = 720, TableAlreadyExist = 721, + InvalidArraySize = 736, ArraySizeTooBig = 737, RecordTooBig = 738, InvalidPrimaryKeySize = 739, diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 458d567ccf8..fa13b359ca6 100644 --- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -4871,6 +4871,15 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it, nullBits += attrDesc.AttributeArraySize; } + if(attrDesc.AttributeArraySize == 0) + { + parseP->errorCode = CreateTableRef::InvalidArraySize; + parseP->status = status; + parseP->errorKey = it.getKey(); + parseP->errorLine = __LINE__; + return; + } + recordLength += sz; if(attrDesc.AttributeKeyFlag){ keyLength += sz; diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c index 7e4243d56fb..dd4a1cf0b9e 100644 --- a/ndb/src/ndbapi/ndberror.c +++ b/ndb/src/ndbapi/ndberror.c @@ -308,7 +308,7 @@ ErrorBundle ErrorCodes[] = { { 709, SE, "No such table existed" }, { 721, SE, "Table or index with given name already exists" }, { 723, SE, "No such table existed" }, - { 736, SE, "Wrong attribute size" }, + { 736, SE, "Unsupported array size" }, { 737, SE, "Attribute array size too big" }, { 738, SE, "Record too big" }, { 739, SE, "Unsupported primary key length" }, diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt index 5c0b2821d85..9527df600f0 100644 --- a/ndb/test/run-test/daily-devel-tests.txt +++ b/ndb/test/run-test/daily-devel-tests.txt @@ -1,6 +1,6 @@ -max-time: 2500 +max-time: 25000 cmd: atrt-mysql-test-run -args: --do-test=ndb --force +args: --force # # INDEX