diff options
author | unknown <hf@deer.(none)> | 2004-05-26 21:40:27 +0500 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2004-05-26 21:40:27 +0500 |
commit | 8fd378d65a60907b3f4c1c4e52611d9157f4a2ea (patch) | |
tree | da6efb78f98da49c9e60050f45067be7a2860d8a /include/mysql.h | |
parent | 64fee753f698911b9a23a77008d45aa2d25caa31 (diff) | |
download | mariadb-git-8fd378d65a60907b3f4c1c4e52611d9157f4a2ea.tar.gz |
Fix to make Windows compilation smoother
VC++Files/innobase/innobase.dsp:
non-existent file removed
client/mysql.cc:
local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
mysql_get_parameters() interface added
#define max_allowed_packet added
include/mysql_com.h:
these should not be exported
libmysql/libmysql.c:
mysql_get_parameters implementations
libmysql/libmysql.def:
interface changed
libmysql_r/Makefile.am:
MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
interface changed
sql/log_event.cc:
should be like that in this case
tools/mysqlmanager.c:
compiler warns on this line
Diffstat (limited to 'include/mysql.h')
-rw-r--r-- | include/mysql.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 3ffc014c449..1665dd5027e 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -244,6 +244,17 @@ typedef struct st_mysql_manager char last_error[MAX_MYSQL_MANAGER_ERR]; } MYSQL_MANAGER; +typedef struct st_mysql_parameters +{ + unsigned long *p_max_allowed_packet; + unsigned long *p_net_buffer_length; +} MYSQL_PARAMETERS; + +#if !defined(MYSQL_CLIENT) && !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 work when linked against either the standard client library or the @@ -252,6 +263,8 @@ typedef struct st_mysql_manager int STDCALL mysql_server_init(int argc, char **argv, char **groups); void STDCALL mysql_server_end(void); +MYSQL_PARAMETERS *STDCALL mysql_get_parameters(); + /* Set up and bring down a thread; these function should be called for each thread in an application which opens at least one MySQL |