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

Conflicts resolving

Browse Source
This commit is contained in:
hf@deer.mysql.r18.ru
2003-01-20 18:59:45 +04:00
parent 1f6b615677 d14db3961d
commit 389680e04e
245 changed files with 21922 additions and 1429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/libmysqld.c
View File

@ -475,7 +475,7 @@ static inline int mysql_init_charset(MYSQL *mysql)
MYSQL * STDCALL
mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
const char *passwd __attribute__((unused)), const char *db,
uint port, const char *unix_socket,uint client_flag)
uint port, const char *unix_socket,ulong client_flag)
{
char *db_name;
DBUG_ENTER("mysql_real_connect");