Control: tags -1 patch Hi!
On Tue, 2019-04-02 at 09:53:47 +0300, Otto Kekäläinen wrote: > Could you please check if it is still valid and happening in Debian > unstable there has been several updates MariaDB client libraries / > connector C libraries recently? A rebuild quickly shows this is still the case. The attached patch makes this package build again for me, and removes a warning from using an internal header. Thanks, Guillem
Author: Guillem Jover <gjo...@sipwise.com> Description: Update code against latest mariadb libraries - Do not include internal header which emits warnings now. - Do not use removed CLIENT_LONG_PASSWORD macro, for the lower bound. Bug-Debian: https://bugs.debian.org/919377 --- lib/common.h | 2 ++ lib/dbdriver.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) --- a/lib/common.h +++ b/lib/common.h @@ -127,11 +127,13 @@ #define MYSQLPP_PATH_SEPARATOR '/' #endif +#if 0 #if defined(MYSQLPP_MYSQL_HEADERS_BURIED) # include <mysql/mysql_version.h> #else # include <mysql_version.h> #endif +#endif namespace mysqlpp { --- a/lib/dbdriver.cpp +++ b/lib/dbdriver.cpp @@ -257,7 +257,7 @@ DBDriver::set_option(unsigned int o, boo } if ((n == 1) && - (o >= CLIENT_LONG_PASSWORD) && + (o >= 0) && #if MYSQL_VERSION_ID > 40000 // highest flag value varies by version (o <= CLIENT_MULTI_RESULTS) #else
