summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw44@gmail.com>2018-07-22 15:08:30 +0800
committerTing-Wei Lan <lantw44@gmail.com>2018-07-22 15:08:30 +0800
commite8ceafdb3d6607085e20e43f8ebc572d77879a56 (patch)
tree0d2b30b0b98cf5dfb3f0552630e1f35926ee48ef
parent599312c7a3e432a59950cd01a4ea4a1057867831 (diff)
downloadwspkg-data-e8ceafdb3d6607085e20e43f8ebc572d77879a56.tar.gz
wspkg-data-e8ceafdb3d6607085e20e43f8ebc572d77879a56.tar.zst
wspkg-data-e8ceafdb3d6607085e20e43f8ebc572d77879a56.zip
wsbsd: Fix MySQL++ 3 for MariaDB 10.2
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229950 https://tangentsoft.com/mysqlpp/info/4f077284dd2ca1b6 https://tangentsoft.com/mysqlpp/info/e5f2c3d83f https://bugzilla.redhat.com/show_bug.cgi?id=1471139
-rw-r--r--wsbsd.files/patches/databases_mysql++3.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/wsbsd.files/patches/databases_mysql++3.patch b/wsbsd.files/patches/databases_mysql++3.patch
new file mode 100644
index 0000000..5c9b11e
--- /dev/null
+++ b/wsbsd.files/patches/databases_mysql++3.patch
@@ -0,0 +1,24 @@
+Index: databases/mysql++3/files/patch-lib_dbdriver.cpp
+===================================================================
+--- databases/mysql++3/files/patch-lib_dbdriver.cpp (nonexistent)
++++ databases/mysql++3/files/patch-lib_dbdriver.cpp (working copy)
+@@ -0,0 +1,19 @@
++https://tangentsoft.com/mysqlpp/info/4f077284dd2ca1b6
++https://tangentsoft.com/mysqlpp/info/e5f2c3d83f
++
++Index: lib/dbdriver.cpp
++==================================================================
++--- lib/dbdriver.cpp.orig 2015-03-19 00:55:17 UTC
+++++ lib/dbdriver.cpp
++@@ -257,7 +257,11 @@ DBDriver::set_option(unsigned int o, boo
++ }
++
++ if ((n == 1) &&
+++#ifdef CLIENT_LONG_PASSWORD
++ (o >= CLIENT_LONG_PASSWORD) &&
+++#else
+++ (o >= CLIENT_MYSQL) &&
+++#endif
++ #if MYSQL_VERSION_ID > 40000 // highest flag value varies by version
++ (o <= CLIENT_MULTI_RESULTS)
++ #else