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

Fixed redefinition for ssl structure

Browse Source
This commit is contained in:
Georg Richter
2016-01-18 06:36:38 +01:00
parent f8912935b1
commit f9232bacff
5 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ma_pvio.h
View File

@@ -28,12 +28,6 @@ typedef struct st_ma_pvio_methods PVIO_METHODS;
#define IS_MYSQL_ASYNC_ACTIVE(a) \ #define IS_MYSQL_ASYNC_ACTIVE(a) \
(IS_MYSQL_ASYNC(a)&& (a)->options.extension->async_context->active) (IS_MYSQL_ASYNC(a)&& (a)->options.extension->async_context->active)
#ifndef ssl_defined
#define ssl_defined
struct st_ma_pvio_ssl;
typedef struct st_ma_pvio_ssl MARIADB_SSL;
#endif
enum enum_pvio_timeout { enum enum_pvio_timeout {
PVIO_CONNECT_TIMEOUT= 0, PVIO_CONNECT_TIMEOUT= 0,
PVIO_READ_TIMEOUT, PVIO_READ_TIMEOUT,

8
include/mysql.h
View File

@@ -222,16 +222,15 @@ extern unsigned int mariadb_deinitialize_ssl;
enum mariadb_value { enum mariadb_value {
MARIADB_CHARSET_ID, MARIADB_CHARSET_ID,
MARIADB_CHARSET_INFO,
MARIADB_CHARSET_NAME, MARIADB_CHARSET_NAME,
MARIADB_CLIENT_ERRORS, MARIADB_CLIENT_ERRORS,
MARIADB_CLIENT_VERSION, MARIADB_CLIENT_VERSION,
MARIADB_CLIENT_VERSION_ID, MARIADB_CLIENT_VERSION_ID,
MARIADB_CONNECTION_ERROR,
MARIADB_CONNECTION_ERROR_ID,
MARIADB_CONNECTION_SQLSTATE,
MARIADB_CONNECTION_ASYNC_TIMEOUT, MARIADB_CONNECTION_ASYNC_TIMEOUT,
MARIADB_CONNECTION_ASYNC_TIMEOUT_MS, MARIADB_CONNECTION_ASYNC_TIMEOUT_MS,
MARIADB_CONNECTION_CHARSET_INFO,
MARIADB_CONNECTION_ERROR,
MARIADB_CONNECTION_ERROR_ID,
MARIADB_CONNECTION_HOST, MARIADB_CONNECTION_HOST,
MARIADB_CONNECTION_INFO, MARIADB_CONNECTION_INFO,
MARIADB_CONNECTION_PORT, MARIADB_CONNECTION_PORT,
@@ -242,6 +241,7 @@ extern unsigned int mariadb_deinitialize_ssl;
MARIADB_CONNECTION_SERVER_VERSION, MARIADB_CONNECTION_SERVER_VERSION,
MARIADB_CONNECTION_SERVER_VERSION_ID, MARIADB_CONNECTION_SERVER_VERSION_ID,
MARIADB_CONNECTION_SOCKET, MARIADB_CONNECTION_SOCKET,
MARIADB_CONNECTION_SQLSTATE,
MARIADB_CONNECTION_SSL_CIPHER, MARIADB_CONNECTION_SSL_CIPHER,
MARIADB_CONNECTION_SSL_LIBRARY, MARIADB_CONNECTION_SSL_LIBRARY,
MARIADB_CONNECTION_SSL_VERSION, MARIADB_CONNECTION_SSL_VERSION,

2
libmariadb/CMakeLists.txt
View File

@@ -112,7 +112,7 @@ SET(EXPORT_SYMBOLS
mysql_list_tables mysql_list_tables
mysql_list_tables_cont mysql_list_tables_cont
mysql_list_tables_start mysql_list_tables_start
mysql_load_plugin; mysql_load_plugin
mysql_load_plugin_v mysql_load_plugin_v
mysql_more_results mysql_more_results
mysql_next_result mysql_next_result

8
libmariadb/libmariadb.c
View File

@@ -2691,12 +2691,6 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
mysql->options.reconnect= *(uint *)arg1; mysql->options.reconnect= *(uint *)arg1;
break; break;
case MYSQL_OPT_PROTOCOL: case MYSQL_OPT_PROTOCOL:
#ifdef _WIN32
if (*(uint *)arg1 > MYSQL_PROTOCOL_PIPE)
#else
if (*(uint *)arg1 > MYSQL_PROTOCOL_SOCKET)
#endif
goto end;
mysql->options.protocol= *(uint *)arg1; mysql->options.protocol= *(uint *)arg1;
break; break;
case MYSQL_OPT_READ_TIMEOUT: case MYSQL_OPT_READ_TIMEOUT:
@@ -3682,7 +3676,7 @@ my_bool STDCALL mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *
else else
goto error; goto error;
break; break;
case MARIADB_CHARSET_INFO: case MARIADB_CONNECTION_CHARSET_INFO:
if (mysql) if (mysql)
mariadb_get_charset_info(mysql, (MY_CHARSET_INFO *)arg); mariadb_get_charset_info(mysql, (MY_CHARSET_INFO *)arg);
else else

2
unittest/libmariadb/misc.c
View File

@@ -1045,7 +1045,7 @@ static int test_get_info(MYSQL *mysql)
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval); rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval);
FAIL_IF(rc, "mysql_get_info failed"); FAIL_IF(rc, "mysql_get_info failed");
diag("server_version_id: %d", sval); diag("server_version_id: %d", sval);
rc= mariadb_get_infov(mysql, MARIADB_CHARSET_INFO, &cs); rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_CHARSET_INFO, &cs);
FAIL_IF(rc, "mysql_get_info failed"); FAIL_IF(rc, "mysql_get_info failed");
diag("charset name: %s", cs.csname); diag("charset name: %s", cs.csname);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_PVIO_TYPE, &ival); rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_PVIO_TYPE, &ival);