# HG changeset patch # User Sebastien Jodogne # Date 1608129666 -3600 # Node ID 0b78198c28d6184367f1850aa9c08161eb4b90f4 # Parent 6fe74f9a516e43a1f939f41ab47e45c4359899bb compatibility with mysql client 8.x diff -r 6fe74f9a516e -r 0b78198c28d6 Framework/MySQL/MySQLDatabase.cpp --- a/Framework/MySQL/MySQLDatabase.cpp Wed Dec 16 15:05:19 2020 +0100 +++ b/Framework/MySQL/MySQLDatabase.cpp Wed Dec 16 15:41:06 2020 +0100 @@ -145,13 +145,18 @@ { if (parameters_.IsVerifyServerCertificates()) { +#if (MYSQL_VERSION_ID > 50110 && MYSQL_VERSION_ID < 80000) // Removed in MySQL client 8.0 my_bool verifyCert = 1; mysql_options(mysql_, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *) &verifyCert); +#endif + mysql_options(mysql_, MYSQL_OPT_SSL_CA, (void *)(parameters_.GetSslCaCertificates())); } +#if (MYSQL_VERSION_ID > 50110 && MYSQL_VERSION_ID < 80000) // Removed in MySQL client 8.0 my_bool enforceTls = 1; mysql_options(mysql_, MYSQL_OPT_SSL_ENFORCE, (void *) &enforceTls); +#endif } const char* socket = (parameters_.GetUnixSocket().empty() ? NULL :