thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 08:47:17 +01:00
Code Releases Activity

Some mysql installations don't have mysql_reset_connection

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-02-01 02:30:18 +02:00
parent 033de17565
commit 318bcf10c5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/POCO/Data/MySQL/CMakeLists.txt vendored
View File

@ -34,6 +34,17 @@ if(WIN32)
target_compile_definitions(DataMySQL PUBLIC __LCC__) #__LCC__ define used by MySQL.h target_compile_definitions(DataMySQL PUBLIC __LCC__) #__LCC__ define used by MySQL.h
endif() endif()
if(UNIX)
include(CheckSymbolExists)
# Some instalations don't have mysql_reset_connection() even if their version indicates otherwise
CHECK_SYMBOL_EXISTS(mysql_reset_connection "${MYSQL_INCLUDE_DIR}/mysql.h" HAVE_MYSQL_RESET_CONNECTION)
if(HAVE_MYSQL_RESET_CONNECTION)
message(status "Found: mysql_reset_connection")
target_compile_definitions(DataMySQL PRIVATE HAVE_MYSQL_RESET_CONNECTION)
endif()
endif()
POCO_INSTALL(DataMySQL) POCO_INSTALL(DataMySQL)
POCO_GENERATE_PACKAGE(DataMySQL) POCO_GENERATE_PACKAGE(DataMySQL)

2
vendor/POCO/Data/MySQL/src/SessionHandle.cpp vendored
View File

@ -183,7 +183,7 @@ void SessionHandle::rollback()
void SessionHandle::reset() void SessionHandle::reset()
{ {
#if ((defined (MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)) || ((defined (MARIADB_PACKAGE_VERSION_ID)) && (MARIADB_PACKAGE_VERSION_ID >= 30000)) #if defined(HAVE_MYSQL_RESET_CONNECTION) && (((defined (MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)) || ((defined (MARIADB_PACKAGE_VERSION_ID)) && (MARIADB_PACKAGE_VERSION_ID >= 30000)))
if (mysql_reset_connection(_pHandle) != 0) if (mysql_reset_connection(_pHandle) != 0)
#else #else
if (mysql_refresh(_pHandle, REFRESH_TABLES | REFRESH_STATUS | REFRESH_THREADS | REFRESH_READ_LOCK) != 0) if (mysql_refresh(_pHandle, REFRESH_TABLES | REFRESH_STATUS | REFRESH_THREADS | REFRESH_READ_LOCK) != 0)