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

Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0

Browse source 
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj


storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  change error message to more appropriate
This commit is contained in:
unknown 2006-09-21 10:22:20 +08:00
commit 6647c80f3f
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
storage/ndb/src/ndbapi/NdbOperation.cpp
View file

@ -312,13 +312,31 @@ NdbOperation::setValue(Uint32 anAttrId, const char* aValuePassed)
NdbBlob*
NdbOperation::getBlobHandle(const char* anAttrName)
{
return getBlobHandle(theNdbCon, m_currentTable->getColumn(anAttrName));
const NdbColumnImpl* col = m_currentTable->getColumn(anAttrName);
if (col == NULL)
{
setErrorCode(4004);
return NULL;
}
else
{
return getBlobHandle(theNdbCon, col);
}
}
NdbBlob*
NdbOperation::getBlobHandle(Uint32 anAttrId)
{
return getBlobHandle(theNdbCon, m_currentTable->getColumn(anAttrId));
const NdbColumnImpl* col = m_currentTable->getColumn(anAttrId);
if (col == NULL)
{
setErrorCode(4004);
return NULL;
}
else
{
return getBlobHandle(theNdbCon, col);
}
}
int

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

@ -486,7 +486,7 @@ ErrorBundle ErrorCodes[] = {
{ 1420, DMEC, TR, "Subscriber manager busy with adding/removing a table" },
{ 4004, DMEC, AE, "Attribute name not found in the Table" },
{ 4004, DMEC, AE, "Attribute name or id not found in the table" },
{ 4100, DMEC, AE, "Status Error in NDB" },
{ 4101, DMEC, AE, "No connections to NDB available and connect failed" },