summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2006-04-21 12:16:17 +0200
committerunknown <mskold@mysql.com>2006-04-21 12:16:17 +0200
commit946adafdc213dbe0ab8f0d995f9ac8d93b20e23b (patch)
treeb5fac263e3657181c5a02846fa8616eee267b307 /ndb
parent18b2515817535a9bfdbb00d4087395e790a74a43 (diff)
parent8b35dc57380b131b17ae9afb449adc71ec9c6b97 (diff)
downloadmariadb-git-946adafdc213dbe0ab8f0d995f9ac8d93b20e23b.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/ndbapi/NdbScanOperation.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index 9f8a2916d2f..869704c7bb3 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -1086,6 +1086,11 @@ int
NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo,
int type, const void* aValue, Uint32 len)
{
+ if (!tAttrInfo)
+ {
+ setErrorCodeAbort(4318); // Invalid attribute
+ return -1;
+ }
if (theOperationType == OpenRangeScanRequest &&
(0 <= type && type <= 4) &&
len <= 8000) {