Skip to content

Commit 6bbf9ba

Browse files
committed
Fixed the patch issue of SOCI
1 parent 60599e5 commit 6bbf9ba

6 files changed

Lines changed: 6 additions & 96 deletions

File tree

python-3.10-bullseye/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

python-3.10-buster/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

python-3.8-bullseye/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

python-3.8-buster/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

python-3.9-bullseye/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

python-3.9-buster/resources/soci-debian-cmake.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,4 @@ diff -Naur soci-4.0.2/CMakeLists.txt soci-4.0.2.new/CMakeLists.txt
2121

2222
###############################################################################
2323
# Configuration files
24-
diff -Naur soci-4.0.2/src/backends/mysql/session.cpp soci-4.0.2.new/src/backends/mysql/session.cpp
25-
--- soci-4.0.2/src/backends/mysql/session.cpp 2021-04-20 09:43:34.000000000 +0000
26-
+++ soci-4.0.2.new/src/backends/mysql/session.cpp 2021-07-11 16:41:13.637174415 +0000
27-
@@ -355,7 +355,11 @@
28-
}
29-
if (reconnect_p)
30-
{
31-
- my_bool reconnect = 1;
32-
+ #if MYSQL_VERSION_ID < 8
33-
+ my_bool reconnect = 1;
34-
+ #else
35-
+ bool reconnect = 1;
36-
+ #endif
37-
if (0 != mysql_options(conn_, MYSQL_OPT_RECONNECT, &reconnect))
38-
{
39-
clean_up();
24+

0 commit comments

Comments
 (0)