database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 4.0 to get windows fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-05-27 00:30:28 +03:00
parent c342318c6e dab0b7d415
commit 61a6557307
21 changed files with 78 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libmysqld/libmysqld.c
View File

@ -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,