| 12345678910111213141516171819202122 |
- diff -up qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
- --- qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex 2017-10-02 03:43:38.000000000 -0500
- +++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2017-10-19 14:56:16.752878279 -0500
- @@ -1159,14 +1159,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
|
