Commit 12ab6a4f authored by Sergey Petrunya's avatar Sergey Petrunya

MDEV-498: Cassandra: Inserting a timestamp does not work on a 32-bit system

- Make an attempt at fixing.
parent 6cce5204
...@@ -210,6 +210,12 @@ select * from t2; ...@@ -210,6 +210,12 @@ select * from t2;
rowkey datecol rowkey datecol
1 2012-08-29 01:23:45 1 2012-08-29 01:23:45
delete from t2; delete from t2;
# MDEV-498: Cassandra: Inserting a timestamp does not work on a 32-bit system
INSERT INTO t2 VALUES (10,'2012-12-12 12:12:12');
SELECT * FROM t2;
rowkey datecol
10 2012-12-12 12:12:12
delete from t2;
# #
# (no MDEV#) Check that insert counters work correctly # (no MDEV#) Check that insert counters work correctly
# #
......
...@@ -236,6 +236,11 @@ insert into t2 values (1, '2012-08-29 01:23:45'); ...@@ -236,6 +236,11 @@ insert into t2 values (1, '2012-08-29 01:23:45');
select * from t2; select * from t2;
delete from t2; delete from t2;
--echo # MDEV-498: Cassandra: Inserting a timestamp does not work on a 32-bit system
INSERT INTO t2 VALUES (10,'2012-12-12 12:12:12');
SELECT * FROM t2;
delete from t2;
--echo # --echo #
--echo # (no MDEV#) Check that insert counters work correctly --echo # (no MDEV#) Check that insert counters work correctly
--echo # --echo #
......
...@@ -599,7 +599,7 @@ class TimestampDataConverter : public ColumnDataConverter ...@@ -599,7 +599,7 @@ class TimestampDataConverter : public ColumnDataConverter
ts_time= ((Field_timestamp*)field)->get_timestamp(&ts_microsec); ts_time= ((Field_timestamp*)field)->get_timestamp(&ts_microsec);
/* Cassandra needs milliseconds-since-epoch */ /* Cassandra needs milliseconds-since-epoch */
tmp= ts_time * 1000 + ts_microsec/1000; tmp= ((int64_t)ts_time) * 1000 + ts_microsec/1000;
flip64((const char*)&tmp, (char*)&buf); flip64((const char*)&tmp, (char*)&buf);
*cass_data= (char*)&buf; *cass_data= (char*)&buf;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment