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

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
parents 3cf3a921 100054dc
......@@ -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
......
......@@ -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" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment