Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

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)

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,

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;

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" },

ndb/test/run-test/daily-devel-tests.txt

-max-time: 2500
+max-time: 25000
 cmd: atrt-mysql-test-run
-args: --do-test=ndb --force
+args: --force
 
 #
 # INDEX