HighSocietyRaiding/Fractured
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

fix(db): MariaDB version parse for 10.x-MariaDB- without 5.5.5- prefix

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Dawnforger
2026-05-08 21:49:18 -05:00
parent df7e943a74
commit 63ab74b4fb
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/database/Database/DatabaseWorkerPool.cpp
+14 -9
View File
@@ -434,18 +434,23 @@ bool DatabaseIncompatibleVersion(std::string const mysqlVersion)
std::string ver = mysqlVersion; std::string ver = mysqlVersion;
std::string minVersion = MIN_MYSQL_SERVER_VERSION; std::string minVersion = MIN_MYSQL_SERVER_VERSION;
// MariaDB: mysql_get_server_info() often starts with MySQL-compat "5.5.5-" then real version, e.g. // MariaDB: version string may be:
// "5.5.5-10.6.11-MariaDB-1:10.6.11+maria~ubu2004" // - "5.5.5-10.6.11-MariaDB-1:10.6.11+maria~..." (MySQL wire compat prefix)
// - "10.6.11-MariaDB-1:10.6.11+maria~..." (no 5.5.5- prefix)
// parseTriplet() on the full second form stops at the first '-', yielding 10.6.11.
// Never take "firstDash..secondDash" — that becomes "MariaDB" and compares as 0.0.0.
if (ver.find("MariaDB") != std::string::npos) if (ver.find("MariaDB") != std::string::npos)
{ {
size_t const firstDash = ver.find('-');
if (firstDash != std::string::npos)
{
size_t const secondDash = ver.find('-', firstDash + 1);
if (secondDash != std::string::npos)
ver = ver.substr(firstDash + 1, secondDash - firstDash - 1);
}
minVersion = MIN_MARIADB_SERVER_VERSION; minVersion = MIN_MARIADB_SERVER_VERSION;
if (ver.compare(0, 6, "5.5.5-") == 0)
{
size_t const afterPrefix = 6;
size_t const nextDash = ver.find('-', afterPrefix);
if (nextDash != std::string::npos)
ver = ver.substr(afterPrefix, nextDash - afterPrefix);
else
ver = ver.substr(afterPrefix);
}
} }
return compareVersion(parseTriplet(ver), parseTriplet(minVersion)) < 0; return compareVersion(parseTriplet(ver), parseTriplet(minVersion)) < 0;