23 lines
848 B
Diff
23 lines
848 B
Diff
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
|
index 365f899..9ff415d 100644
|
|
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
|
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
|
@@ -1160,14 +1160,15 @@ static void qLibraryInit()
|
|
# endif // MYSQL_VERSION_ID
|
|
#endif // Q_NO_MYSQL_EMBEDDED
|
|
|
|
-#ifdef MARIADB_BASE_VERSION
|
|
+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
|
|
qAddPostRoutine([]() { mysql_server_end(); });
|
|
#endif
|
|
}
|
|
|
|
static void qLibraryEnd()
|
|
{
|
|
-#if !defined(MARIADB_BASE_VERSION)
|
|
+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
|
|
+//#error should not get here on f27+ says rex
|
|
# if !defined(Q_NO_MYSQL_EMBEDDED)
|
|
# if MYSQL_VERSION_ID > 40000
|
|
# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
|