1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Description: Fix ftbfs with new mysql, new libdivide
Author: Dimitri John Ledkov <xnox@ubuntu.com>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2020-02-21
--- clickhouse-18.16.1+ds.orig/dbms/src/Functions/intDiv.cpp
+++ clickhouse-18.16.1+ds/dbms/src/Functions/intDiv.cpp
@@ -45,7 +45,8 @@ struct DivideIntegralByConstantImpl
const A * a_end = a_pos + size;
ResultType * c_pos = c.data();
-#if __SSE2__
+//#if __SSE2__
+#if 0
static constexpr size_t values_per_sse_register = 16 / sizeof(A);
const A * a_end_sse = a_pos + size / values_per_sse_register * values_per_sse_register;
--- clickhouse-18.16.1+ds.orig/libs/libmysqlxx/src/Connection.cpp
+++ clickhouse-18.16.1+ds/libs/libmysqlxx/src/Connection.cpp
@@ -111,7 +111,7 @@ void Connection::connect(const char* db,
throw ConnectionFailed(errorMessage(driver.get()), mysql_errno(driver.get()));
/// Enables auto-reconnect.
- my_bool reconnect = true;
+ bool reconnect = true;
if (mysql_options(driver.get(), MYSQL_OPT_RECONNECT, reinterpret_cast<const char *>(&reconnect)))
throw ConnectionFailed(errorMessage(driver.get()), mysql_errno(driver.get()));
|
