diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:27:37 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:27:37 +0000 |
| commit | 7b89b9f5108c80f4f270da922d7e6c182a663719 (patch) | |
| tree | 858a3873942f07610fb26685781e8bdbd3ab2c7f /include/mysql.h | |
| parent | daff133ddf9a9d120050703c0b5753979c6190e0 (diff) | |
| download | mariadb-git-7b89b9f5108c80f4f270da922d7e6c182a663719.tar.gz | |
MDEV-9293 Connector/C integration
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/mysql.h b/include/mysql.h index 19099b4f404..314cc40dd6c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -351,10 +351,6 @@ typedef struct st_mysql_parameters */ #define MYSQL_WAIT_TIMEOUT 8 -#if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY) -#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet) -#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length) -#endif /* Set up and bring down the server; to ensure that applications will @@ -862,6 +858,7 @@ void STDCALL mysql_close(MYSQL *sock); int STDCALL mysql_close_start(MYSQL *sock); int STDCALL mysql_close_cont(MYSQL *sock, int status); my_socket STDCALL mysql_get_socket(const MYSQL *mysql); +int STDCALL mysql_cancel(MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql); |