database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Added mysql_options4 (was #define before)

Browse Source
This commit is contained in:
Georg Richter
2016-02-02 10:11:15 +01:00
parent a442a5f2ee
commit ccb8798f09
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/plugins.cmake
View File

@@ -50,7 +50,7 @@ IF(CURL_FOUND)
IF(WIN32) IF(WIN32)
REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "DYNAMIC" "remote_io" 1) REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "DYNAMIC" "remote_io" 1)
ELSE() ELSE()
REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "STATIC" "remote_io" 1) REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "DYNAMIC" "remote_io" 1)
ENDIF() ENDIF()
ENDIF() ENDIF()

5
include/mysql.h
View File

@@ -126,9 +126,6 @@ extern unsigned int mariadb_deinitialize_ssl;
typedef unsigned long long my_ulonglong; typedef unsigned long long my_ulonglong;
#endif #endif
/* mysql compatibility macro */
#define mysql_options4(A,B,C,D) mysql_optionsv((A),(B),(C),(D))
#define SET_CLIENT_ERROR(a, b, c, d) \ #define SET_CLIENT_ERROR(a, b, c, d) \
{ \ { \
(a)->net.last_errno= (b);\ (a)->net.last_errno= (b);\
@@ -487,6 +484,8 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql);
MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql); MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql);
int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
const void *arg); const void *arg);
int STDCALL mysql_options4(MYSQL *mysql,enum mysql_option option,
const void *arg1, const void *arg2);
void STDCALL mysql_free_result(MYSQL_RES *result); void STDCALL mysql_free_result(MYSQL_RES *result);
void STDCALL mysql_data_seek(MYSQL_RES *result, void STDCALL mysql_data_seek(MYSQL_RES *result,
my_ulonglong offset); my_ulonglong offset);

3
libmariadb/CMakeLists.txt
View File

@@ -121,6 +121,7 @@ SET(EXPORT_SYMBOLS
mysql_num_fields mysql_num_fields
mysql_num_rows mysql_num_rows
mysql_options mysql_options
mysql_options4
mysql_optionsv mysql_optionsv
mysql_ping mysql_ping
mysql_ping_cont mysql_ping_cont
@@ -305,10 +306,8 @@ my_malloc.c
my_messnc.c my_messnc.c
my_net.c my_net.c
my_once.c my_once.c
my_open.c
my_port.c my_port.c
my_pthread.c my_pthread.c
my_read.c
my_realloc.c my_realloc.c
my_seek.c my_seek.c
my_static.c my_static.c

5
libmariadb/libmariadb.c
View File

@@ -3258,6 +3258,11 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
return mysql_optionsv(mysql, option, arg); return mysql_optionsv(mysql, option, arg);
} }
int STDCALL
mysql_options4(MYSQL *mysql,enum mysql_option option, const void *arg1, const void *arg2)
{
return mysql_optionsv(mysql, option, arg1, arg2);
}
/**************************************************************************** /****************************************************************************
** Functions to get information from the MySQL structure ** Functions to get information from the MySQL structure
** These are functions to make shared libraries more usable. ** These are functions to make shared libraries more usable.