diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-19 15:46:27 +0000 |
| commit | 31a8cf54c8a7913338480a0571feaf32143b5f64 (patch) | |
| tree | 8847835f515af17d6c090300b138c31e1226731e /include/mysql.h | |
| parent | 7b89b9f5108c80f4f270da922d7e6c182a663719 (diff) | |
| download | mariadb-git-31a8cf54c8a7913338480a0571feaf32143b5f64.tar.gz | |
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 314cc40dd6c..19099b4f404 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -351,6 +351,10 @@ 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 @@ -858,7 +862,6 @@ 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); |