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

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


ndb/src/ndbapi/ndberror.c:
  Auto merged

ndb/src/ndbapi/NdbOperation.cpp

@@ -319,13 +319,31 @@ NdbOperation::setValue( Uint32 anAttrId,
 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

ndb/src/ndbapi/ndberror.c

@@ -401,7 +401,7 @@ ErrorBundle ErrorCodes[] = {
    * Still uncategorized
    */
   { 720,  AE, "Attribute name reused in table definition" },
-  { 4004, AE, "Attribute name not found in the Table" },
+  { 4004, AE, "Attribute name or id not found in the table" },
   
   { 4100, AE, "Status Error in NDB" },
   { 4101, AE, "No connections to NDB available and connect failed" },