summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorDinar Valeev <dvaleev@suse.com>2015-03-25 17:21:52 +0100
committerDinar Valeev <dvaleev@suse.com>2015-03-25 17:21:52 +0100
commit71bbff8de374f828ac9b319f8f110b30954730ae (patch)
treebd06228c72b338c746af4870f20119b09827dd3c /storage
parent651a142ad02dc51926f8159d9e923552f782612e (diff)
downloadmariadb-git-71bbff8de374f828ac9b319f8f110b30954730ae.tar.gz
Fix BigEndian build
On BigEndian build fails with: [ 109s] /home/abuild/rpmbuild/BUILD/mariadb-10.0.17/storage/cassandra/ha_cassandra.cc:890:22: error: invalid conversion from 'longlong* {aka long long int*} ' to 'long long int' [-fpermissive] [ 109s] value->x.long_value= (longlong *)*cass_data; [ 109s] ^ This commit fixes it Signed-off-by: Dinar Valeev <dvaleev@suse.com>
Diffstat (limited to 'storage')
-rw-r--r--storage/cassandra/ha_cassandra.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index 9b30445fcd2..e69e740bfcd 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -887,7 +887,7 @@ bool cassandra_to_dyncol_intLong(const char *cass_data,
{
value->type= DYN_COL_INT;
#ifdef WORDS_BIGENDIAN
- value->x.long_value= (longlong *)*cass_data;
+ value->x.long_value= (longlong)*cass_data;
#else
flip64(cass_data, (char *)&value->x.long_value);
#endif