diff options
Diffstat (limited to 'debian/patches/mariadb_library_end.diff')
-rw-r--r-- | debian/patches/mariadb_library_end.diff | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/debian/patches/mariadb_library_end.diff b/debian/patches/mariadb_library_end.diff deleted file mode 100644 index 2c77d69..0000000 --- a/debian/patches/mariadb_library_end.diff +++ /dev/null @@ -1,35 +0,0 @@ -Description: call mysql_library_end() only once when using MariaDB -Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d25346417238b7dc -Last-Update: 2017-09-27 - ---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -1158,16 +1158,22 @@ - } - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED -+ -+#ifdef MARIADB_BASE_VERSION -+ qAddPostRoutine(mysql_server_end); -+#endif - } - - static void qLibraryEnd() - { --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID > 40000 --# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 -- mysql_library_end(); --# else -- mysql_server_end(); -+#if !defined(MARIADB_BASE_VERSION) -+# if !defined(Q_NO_MYSQL_EMBEDDED) -+# if MYSQL_VERSION_ID > 40000 -+# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 -+ mysql_library_end(); -+# else -+ mysql_server_end(); -+# endif - # endif - # endif - #endif |