database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Revert "MDEV-9293 Connector/C integration"

Browse Source 
This reverts commit 7b89b9f510.
This commit is contained in:
Vladislav Vaintroub
2016-08-19 15:46:27 +00:00
parent 7b89b9f510
commit 31a8cf54c8
61 changed files with 412 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql-common/client.c
View File

@ -1005,6 +1005,11 @@ enum option_id {
static TYPELIB option_types={array_elements(default_options)-1,
"options",default_options, NULL};
const char *sql_protocol_names_lib[] =
{ "TCP", "SOCKET", "PIPE", "MEMORY", NullS };
TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"",
sql_protocol_names_lib, NULL};
static int add_init_command(struct st_mysql_options *options, const char *cmd)
{
char *tmp;
@ -4769,11 +4774,3 @@ mysql_get_socket(const MYSQL *mysql)
return vio_fd(mysql->net.vio);
return INVALID_SOCKET;
}
int STDCALL mysql_cancel(MYSQL *mysql)
{
if (mysql->net.vio)
return vio_shutdown(mysql->net.vio, SHUT_RDWR);
return -1;
}