diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2025-11-28 19:54:59 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2025-12-01 22:59:38 +0100 |
| commit | 7657f29027867d21a75c29d641d15a8ee6d92d18 (patch) | |
| tree | 7c6d47a6e4d649ca0671614e372e4f9b01f6057d /src/plugins/sqldrivers/mysql/qsql_mysql.cpp | |
| parent | c94ce38e4946e512f9b567c470ba98cbe933dfde (diff) | |
SQL/MariaDB: Enable MYSQL_OPT_TLS_VERSION
MYSQL_OPT_TLS_VERSION is supported since MariaDB C Connector 3.1.10 so
we should enable it also for MariaDB.
Pick-to: 6.10
Change-Id: Iaec42fa83bf6da42295d297455f07436afeae8d3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 50087615d7a..7faacca3d6c 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -1301,7 +1301,7 @@ bool QMYSQLDriver::open(const QString &db, {"MYSQL_OPT_SSL_CIPHER"_L1, MYSQL_OPT_SSL_CIPHER, setOptionString}, {"MYSQL_OPT_SSL_CRL"_L1, MYSQL_OPT_SSL_CRL, setOptionString}, {"MYSQL_OPT_SSL_CRLPATH"_L1, MYSQL_OPT_SSL_CRLPATH, setOptionString}, -#if defined(MYSQL_VERSION_ID) && MYSQL_VERSION_ID >= 50710 +#if defined(MYSQL_VERSION_ID) && MYSQL_VERSION_ID >= 50710 || defined(MARIADB_VERSION_ID) {"MYSQL_OPT_TLS_VERSION"_L1, MYSQL_OPT_TLS_VERSION, setOptionString}, #endif #if defined(MYSQL_VERSION_ID) && MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_VERSION_ID) |