summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2006-03-28 15:40:08 +0200
committerjonas@perch.ndb.mysql.com <>2006-03-28 15:40:08 +0200
commit48fa5cb63cc721cb01990f54a9d0dca73e99d384 (patch)
tree7889dba2c1a2168331d350ccd80a7d61e862e89a /sql/ha_ndbcluster.cc
parent37a6167d6db4eb216649741f7a522bb21c95867e (diff)
parent0a9db2a0564f790699e1b5bcec145d2fed172b9c (diff)
downloadmariadb-git-48fa5cb63cc721cb01990f54a9d0dca73e99d384.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 5779bca677a..416881e80da 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -6081,7 +6081,9 @@ ha_ndbcluster::setup_recattr(const NdbRecAttr* curr)
if ((* value).ptr)
{
DBUG_ASSERT(curr != 0);
- (* value).rec= curr;
+ NdbValue* val= m_value + curr->getColumn()->getColumnNo();
+ DBUG_ASSERT(val->ptr);
+ val->rec= curr;
curr= curr->next();
}
}