Commit ea21baa5 authored by unknown's avatar unknown
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 

into deer.(none):/home/hf/work/mysql-4.0
parents 0858e15c 09b9182e

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ typedef struct st_mysql_parameters 
int STDCALL mysql_server_init(int argc, char **argv, char **groups);

void STDCALL mysql_server_end(void);



MYSQL_PARAMETERS *STDCALL mysql_get_parameters();

MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);



/*

  Set up and bring down a thread; these function should be called

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void STDCALL mysql_server_end() 
static MYSQL_PARAMETERS mysql_internal_parameters=

{&max_allowed_packet, &net_buffer_length};



MYSQL_PARAMETERS *STDCALL mysql_get_parameters()

MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void)

{

  return &mysql_internal_parameters;

}