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`.wip/yesman
parent
1dc26c32ed
commit
b8a6649797
@ -1,17 +0,0 @@ |
|||||||
diff --git a/include/my_global.h b/include/my_global.h
|
|
||||||
index cb31ae2..2866f87 100644
|
|
||||||
--- a/include/my_global.h
|
|
||||||
+++ b/include/my_global.h
|
|
||||||
@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef isfinite
|
|
||||||
-#ifdef HAVE_FINITE
|
|
||||||
-#define isfinite(x) finite(x)
|
|
||||||
-#else
|
|
||||||
-#define finite(x) (1.0 / fabs(x) > 0.0)
|
|
||||||
-#endif /* HAVE_FINITE */
|
|
||||||
-#elif (__cplusplus >= 201103L)
|
|
||||||
#include <cmath>
|
|
||||||
static inline bool isfinite(double x) { return std::isfinite(x); }
|
|
||||||
#endif /* isfinite */
|
|
@ -0,0 +1,13 @@ |
|||||||
|
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);
|
Loading…
Reference in new issue