diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 20:03:05 +0000 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 16:27:57 +0200 |
| commit | 56c4cfe0bea0fea8f80692c3df684b204cbfa731 (patch) | |
| tree | dc433fb0f163f8d06498b1cc425c6a57298cf060 /sql-common | |
| parent | 31a8cf54c8a7913338480a0571feaf32143b5f64 (diff) | |
| download | mariadb-git-56c4cfe0bea0fea8f80692c3df684b204cbfa731.tar.gz | |
MDEV-9293 - Use MariaDB's Connector/C in server
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 13 | ||||
| -rw-r--r-- | sql-common/my_time.c | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index fdb17a63ba5..77db558d271 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1005,11 +1005,6 @@ 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; @@ -4774,3 +4769,11 @@ 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; +} diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 28757a2c96c..5fcb07e45c0 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -20,7 +20,7 @@ #include <m_ctype.h> /* Windows version of localtime_r() is declared in my_ptrhead.h */ #include <my_pthread.h> -#include <mysqld_error.h> + ulonglong log_10_int[20]= { @@ -777,6 +777,9 @@ long calc_daynr(uint year,uint month,uint day) DBUG_RETURN(delsum+(int) y/4-temp); } /* calc_daynr */ +/* Can't include mysqld_error.h, it needs mysys to build, thus hardcode 2 error values here. */ +#define ER_WARN_DATA_OUT_OF_RANGE 1264 +#define ER_WARN_INVALID_TIMESTAMP 1299 /* Convert time in MYSQL_TIME representation in system time zone to its |