diff options
author | tomas@poseidon.ndb.mysql.com <> | 2005-01-26 09:42:52 +0100 |
---|---|---|
committer | tomas@poseidon.ndb.mysql.com <> | 2005-01-26 09:42:52 +0100 |
commit | 9259dd1d819bc70ff4ee249494cc25967e7f18c5 (patch) | |
tree | 1b9ed5ce60f9a6058f33a0155d9a23763f42aeea /sql | |
parent | 555680e0c5e8bf10b5412c5cd6ab05cb09c6f318 (diff) | |
parent | 5f33acc0068a9d655dba4af7c4dea9be1b2b56ff (diff) | |
download | mariadb-git-9259dd1d819bc70ff4ee249494cc25967e7f18c5.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'sql')
-rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index c2d12ddd316..c5bb4984f40 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -1476,10 +1476,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op, // Set bound if not cancelled via type -1 if (p.bound_type != -1) { - char truncated_field_name[NDB_MAX_ATTR_NAME_SIZE]; - strnmov(truncated_field_name,field->field_name,sizeof(truncated_field_name)); - truncated_field_name[sizeof(truncated_field_name)-1]= '\0'; - if (op->setBound(truncated_field_name, p.bound_type, p.bound_ptr)) + if (op->setBound(i, p.bound_type, p.bound_ptr)) ERR_RETURN(op->getNdbError()); } } |