From 6383eb55e818f07659ae3cbebd051ec43ce81023 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 23 Oct 2017 14:51:49 -0500 Subject: [PATCH] add awol patch --- ...rywhere-opensource-src-4.8.7-mariadb.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 qt-everywhere-opensource-src-4.8.7-mariadb.patch diff --git a/qt-everywhere-opensource-src-4.8.7-mariadb.patch b/qt-everywhere-opensource-src-4.8.7-mariadb.patch new file mode 100644 index 0000000..7e48013 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.7-mariadb.patch @@ -0,0 +1,28 @@ +diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp +--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp 2017-10-23 14:13:15.871808984 -0500 +@@ -1105,11 +1105,16 @@ static void qLibraryInit() + } + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED ++ ++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) ++ qAddPostRoutine(mysql_server_end); ++#endif + } + + static void qLibraryEnd() + { + #ifndef Q_NO_MYSQL_EMBEDDED ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) + # if MYSQL_VERSION_ID > 40000 + # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 + mysql_library_end(); +@@ -1118,6 +1123,7 @@ static void qLibraryEnd() + # endif + # endif + #endif ++#endif + } + + QMYSQLDriver::QMYSQLDriver(QObject * parent)