mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 20:53:48 +00:00
b8a6649797
The contents of `clang-isfinite.patch` are no longer necessary after upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which includes a similar change. Building in c++11 mode removes support for the GCC `typeof` extension in favor of the standardized `__typeof__`. This causes errors when using the `strmake_buf` macro, which relies on `typeof`.
14 lines
525 B
Diff
14 lines
525 B
Diff
diff --git a/sql/table.cc b/sql/table.cc
|
|
index e46af771507..9bef21a1da2 100644
|
|
--- a/sql/table.cc
|
|
+++ b/sql/table.cc
|
|
@@ -8814,7 +8814,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id)
|
|
|
|
store(FLD_BEGIN_TS, thd->transaction_time());
|
|
thd->set_time();
|
|
- timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())};
|
|
+ timeval end_time= {thd->query_start(), int(thd->query_start_sec_part())};
|
|
store(FLD_TRX_ID, start_id);
|
|
store(FLD_COMMIT_ID, end_id);
|
|
store(FLD_COMMIT_TS, end_time);
|