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

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

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
aed6916d · mskold@mysql.com · 1afc70d0 · 472aeeb9 · aed6916d
Commit aed6916d authored Apr 21, 2006 by mskold@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

storage/ndb/src/ndbapi/NdbScanOperation.cpp storage/ndb/src/ndbapi/NdbScanOperation.cpp +5 -0

No files found.
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -1106,6 +1106,11 @@ int
 NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo, 
 				int type, const void* aValue)
 {
+  if (!tAttrInfo)
+  {
+    setErrorCodeAbort(4318);    // Invalid attribute
+    return -1;
+  }
  if (theOperationType == OpenRangeScanRequest &&
      (0 <= type && type <= 4)) {
    // insert bound type