Commit 4e90495f authored by unknown's avatar unknown

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents 17e3ee35 8b35dc57
...@@ -1106,6 +1106,11 @@ int ...@@ -1106,6 +1106,11 @@ int
NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo, NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo,
int type, const void* aValue) int type, const void* aValue)
{ {
if (!tAttrInfo)
{
setErrorCodeAbort(4318); // Invalid attribute
return -1;
}
if (theOperationType == OpenRangeScanRequest && if (theOperationType == OpenRangeScanRequest &&
(0 <= type && type <= 4)) { (0 <= type && type <= 4)) {
// insert bound type // insert bound type
......
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