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 | 00c41b28504728ecdce90a3a2975102e401a3bfc (patch) | |
tree | da6efb78f98da49c9e60050f45067be7a2860d8a /libmysqld/libmysqld.c | |
parent | 3b1dd9af7b1ba6645bf8c5594ee456ca62d0f4c0 (diff) | |
download | mariadb-git-00c41b28504728ecdce90a3a2975102e401a3bfc.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 'libmysqld/libmysqld.c')
-rw-r--r-- | libmysqld/libmysqld.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 2e8cd2a4861..6f60e4c4fbc 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -46,6 +46,9 @@ #define INADDR_NONE -1 #endif +extern ulong net_buffer_length; +extern ulong max_allowed_packet; + static my_bool mysql_client_init=0; uint mysql_port=0; my_string mysql_unix_port=0; @@ -722,6 +725,15 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) return 0; } +static MYSQL_PARAMETERS mysql_internal_parameters= +{&max_allowed_packet, &net_buffer_length}; + +MYSQL_PARAMETERS *STDCALL mysql_get_parameters() +{ + return &mysql_internal_parameters; +} + + /**************************************************************************** ** Init MySQL structure or allocate one ****************************************************************************/ |