diff options
author | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
---|---|---|
committer | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
commit | c1ad782319e313f41ac50d3e2f813948a3c6670c (patch) | |
tree | 860d3e1e3f78acd71eb2c273baa83df9e299a7ab /ndb/src/ndbapi/NdbOperationDefine.cpp | |
parent | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (diff) | |
parent | f6a95153667dab02d11e9d71a2bf6c389ae1571b (diff) | |
download | mariadb-git-c1ad782319e313f41ac50d3e2f813948a3c6670c.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
libmysqld/lib_sql.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbOperationDefine.cpp')
-rw-r--r-- | ndb/src/ndbapi/NdbOperationDefine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/ndb/src/ndbapi/NdbOperationDefine.cpp index 8e8d01a4252..d4112f0a34b 100644 --- a/ndb/src/ndbapi/NdbOperationDefine.cpp +++ b/ndb/src/ndbapi/NdbOperationDefine.cpp @@ -533,8 +533,7 @@ NdbOperation::setValue( const NdbColumnImpl* tAttrInfo, }//if const Uint32 totalSizeInWords = (sizeInBytes + 3)/4; // Including bits in last word const Uint32 sizeInWords = sizeInBytes / 4; // Excluding bits in last word - AttributeHeader& ah = AttributeHeader::init(&ahValue, tAttrId, - totalSizeInWords); + (void) AttributeHeader::init(&ahValue, tAttrId, totalSizeInWords); insertATTRINFO( ahValue ); /*********************************************************************** |