1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL/MySQL: adjust check for MariaDB client library

Browse Source 
The correct define to check for MariaDB C Connector is
MARIADB_PACKAGE_VERSION_ID, not MARIADB_BASE_VERSION (which is a string
describing the server version the c connector relates to).

Pick-to: 6.9 6.8
Task-number: QTBUG-136550
Change-Id: I844900d9b6622fd3a72db63298e5c34de8a2f3dc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Christian Ehrlicher 2025-05-01 15:43:22 +02:00
parent fd09d6f5d5
commit dbbe65fb26
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -1094,14 +1094,14 @@ static void qLibraryInit()
} }
#endif // Q_NO_MYSQL_EMBEDDED #endif // Q_NO_MYSQL_EMBEDDED
#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) #if defined(MARIADB_PACKAGE_VERSION_ID)
qAddPostRoutine([]() { mysql_server_end(); }); qAddPostRoutine([]() { mysql_server_end(); });
#endif #endif
} }
static void qLibraryEnd() static void qLibraryEnd()
{ {
#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) #if !defined(MARIADB_PACKAGE_VERSION_ID)
# if !defined(Q_NO_MYSQL_EMBEDDED) # if !defined(Q_NO_MYSQL_EMBEDDED)
mysql_library_end(); mysql_library_end();
# endif # endif
@ -1360,7 +1360,7 @@ bool QMYSQLDriver::open(const QString &db,
// try utf8 with non BMP first, utf8 (BMP only) if that fails // try utf8 with non BMP first, utf8 (BMP only) if that fails
static const char wanted_charsets[][8] = { "utf8mb4", "utf8" }; static const char wanted_charsets[][8] = { "utf8mb4", "utf8" };
#ifdef MARIADB_VERSION_ID #if defined(MARIADB_PACKAGE_VERSION_ID)
MARIADB_CHARSET_INFO *cs = nullptr; MARIADB_CHARSET_INFO *cs = nullptr;
for (const char *p : wanted_charsets) { for (const char *p : wanted_charsets) {
cs = mariadb_get_charset_by_name(p); cs = mariadb_get_charset_by_name(p);
@ -1512,7 +1512,7 @@ QSqlRecord QMYSQLDriver::record(const QString &tablename) const
+ d->dbName + "' AND table_name = '%1'"_L1; + d->dbName + "' AND table_name = '%1'"_L1;
const auto baTableName = tablename.toUtf8(); const auto baTableName = tablename.toUtf8();
QVarLengthArray<char> tableNameQuoted(baTableName.size() * 2 + 1); QVarLengthArray<char> tableNameQuoted(baTableName.size() * 2 + 1);
#if defined(MARIADB_VERSION_ID) #if defined(MARIADB_PACKAGE_VERSION_ID)
const auto len = mysql_real_escape_string(d->mysql, tableNameQuoted.data(), const auto len = mysql_real_escape_string(d->mysql, tableNameQuoted.data(),
baTableName.data(), baTableName.size()); baTableName.data(), baTableName.size());
#else #else