mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb

Browse source 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
This commit is contained in:
unknown 2004-12-23 10:21:31 +11:00
commit 269e0397a4
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -95,6 +95,7 @@ jcole@tetra.spaceapes.com
jimw@mysql.com jimw@mysql.com
joerg@mysql.com joerg@mysql.com
jon@gigan. jon@gigan.
joreland@bk-internal.mysql.com
joreland@mysql.com joreland@mysql.com
jorge@linux.jorge.mysql.com jorge@linux.jorge.mysql.com
jplindst@t41.(none) jplindst@t41.(none)

1
ndb/include/kernel/signaldata/CreateTable.hpp
View file

@ -86,6 +86,7 @@ public:
NoMoreAttributeRecords = 708, NoMoreAttributeRecords = 708,
AttributeNameTwice = 720, AttributeNameTwice = 720,
TableAlreadyExist = 721, TableAlreadyExist = 721,
InvalidArraySize = 736,
ArraySizeTooBig = 737, ArraySizeTooBig = 737,
RecordTooBig = 738, RecordTooBig = 738,
InvalidPrimaryKeySize = 739, InvalidPrimaryKeySize = 739,

9
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -4871,6 +4871,15 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it,
nullBits += attrDesc.AttributeArraySize; nullBits += attrDesc.AttributeArraySize;
} }
if(attrDesc.AttributeArraySize == 0)
{
parseP->errorCode = CreateTableRef::InvalidArraySize;
parseP->status = status;
parseP->errorKey = it.getKey();
parseP->errorLine = __LINE__;
return;
}
recordLength += sz; recordLength += sz;
if(attrDesc.AttributeKeyFlag){ if(attrDesc.AttributeKeyFlag){
keyLength += sz; keyLength += sz;

2
ndb/src/ndbapi/ndberror.c
View file

@ -308,7 +308,7 @@ ErrorBundle ErrorCodes[] = {
{ 709, SE, "No such table existed" }, { 709, SE, "No such table existed" },
{ 721, SE, "Table or index with given name already exists" }, { 721, SE, "Table or index with given name already exists" },
{ 723, SE, "No such table existed" }, { 723, SE, "No such table existed" },
{ 736, SE, "Wrong attribute size" }, { 736, SE, "Unsupported array size" },
{ 737, SE, "Attribute array size too big" }, { 737, SE, "Attribute array size too big" },
{ 738, SE, "Record too big" }, { 738, SE, "Record too big" },
{ 739, SE, "Unsupported primary key length" }, { 739, SE, "Unsupported primary key length" },

4
ndb/test/run-test/daily-devel-tests.txt
View file

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