diff options
| author | unknown <hf@deer.(none)> | 2004-05-31 13:53:44 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-31 13:53:44 +0500 |
| commit | ea21baa5bff9bec4cbc460499d2563cd3ca427a0 (patch) | |
| tree | 015b85d6f0488ea429e417447e8f7255d1078ae3 | |
| parent | 0858e15c13b1e990838ce6c4b32e90438728a955 (diff) | |
| parent | 09b9182e2e73f06dac3142eb7a637c5c37778586 (diff) | |
| download | mariadb-git-ea21baa5bff9bec4cbc460499d2563cd3ca427a0.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index 1665dd5027e..7db6b36e667 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -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 diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 0a23954ae67..b3624ef3e94 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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; } |