File mariadb-mysql-mismatch.patch of Package poco

Overview Repositories Revisions Requests Users Attributes Meta

File mariadb-mysql-mismatch.patch of Package poco (Revision 46d715137f2d7e4dfa2122145bfde2ec)

Currently displaying revision 46d715137f2d7e4dfa2122145bfde2ec , Show latest

--- poco-poco-1.12.4-release.orig/Data/MySQL/include/Poco/Data/MySQL/MySQL.h	2023-08-09 00:05:22.950988844 +0200
+++ poco-poco-1.12.4-release/Data/MySQL/include/Poco/Data/MySQL/MySQL.h	2023-08-09 00:58:54.875951791 +0200
@@ -70,7 +70,7 @@
 		#define POCO_MYSQL_JSON
 	#endif
 #else
-	#if MYSQL_VERSION_ID >= 50708
+	#if defined(MYSQL_VERSION_ID) && MYSQL_VERSION_ID >= 50708 && !defined (MARIADB_BASE_VERSION)
 		#define POCO_MYSQL_JSON
 	#endif
 #endif
--- poco-poco-1.12.4-release.orig/Data/MySQL/src/SessionHandle.cpp	2023-08-09 00:05:22.950988844 +0200
+++ poco-poco-1.12.4-release/Data/MySQL/src/SessionHandle.cpp	2023-08-09 00:48:41.238452846 +0200
@@ -183,7 +183,7 @@
 
 void SessionHandle::reset()
 {
-#if ((defined (MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)) || ((defined (MARIADB_PACKAGE_VERSION_ID)) && (MARIADB_PACKAGE_VERSION_ID >= 30000))
+#if ((defined (MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700) && (!defined (MARIADB_BASE_VERSION))) || ((defined (MARIADB_PACKAGE_VERSION_ID)) && (MARIADB_PACKAGE_VERSION_ID >= 30000))
 	if (mysql_reset_connection(_pHandle) != 0)
 #else
 	if (mysql_refresh(_pHandle, REFRESH_TABLES | REFRESH_STATUS | REFRESH_THREADS | REFRESH_READ_LOCK) != 0)

Places

File mariadb-mysql-mismatch.patch of Package poco (Revision 46d715137f2d7e4dfa2122145bfde2ec)

Places