diff options
| author | monty@mysql.com <> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-27 00:30:28 +0300 |
| commit | 61a6557307f92eeee1dbb812861d721f96f19656 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /libmysqld/libmysqld.c | |
| parent | c342318c6eea1f29a03100b4534a1b1ad63d92bc (diff) | |
| parent | dab0b7d4159b6af8994cdc3de8324797e092c42c (diff) | |
| download | mariadb-git-61a6557307f92eeee1dbb812861d721f96f19656.tar.gz | |
merge with 4.0 to get windows fixes
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index db9e828369d..b4804c62f2d 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -47,6 +47,9 @@ #define INADDR_NONE -1 #endif +extern ulong net_buffer_length; +extern ulong max_allowed_packet; + #if defined(MSDOS) || defined(__WIN__) #define ERRNO WSAGetLastError() #define perror(A) @@ -81,7 +84,17 @@ static void end_server(MYSQL *mysql) DBUG_VOID_RETURN; } -static inline int mysql_init_charset(MYSQL *mysql) + +static MYSQL_PARAMETERS mysql_internal_parameters= +{&max_allowed_packet, &net_buffer_length}; + +MYSQL_PARAMETERS *STDCALL mysql_get_parameters() +{ + return &mysql_internal_parameters; +} + + +static int mysql_init_charset(MYSQL *mysql) { char charset_name_buff[16], *charset_name; @@ -124,6 +137,7 @@ static inline int mysql_init_charset(MYSQL *mysql) return 0; } + MYSQL * STDCALL mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, |