mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Fix for #2046
Just didn't notice that the mysql_connect function was implemeted in libmysqld.c. Implementation removed. libmysqld/libmysqld.c: supefluous code deleted
This commit is contained in:
parent
80ec807976
commit
fd28d1be71
1 changed files with 0 additions and 22 deletions
|
@ -81,28 +81,6 @@ static void end_server(MYSQL *mysql)
|
|||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
** Connect to sql server
|
||||
** If host == 0 then use localhost
|
||||
**************************************************************************/
|
||||
|
||||
MYSQL * STDCALL
|
||||
mysql_connect(MYSQL *mysql,const char *host,
|
||||
const char *user, const char *passwd)
|
||||
{
|
||||
MYSQL *res;
|
||||
mysql=mysql_init(mysql); /* Make it thread safe */
|
||||
{
|
||||
DBUG_ENTER("mysql_connect");
|
||||
if (!(res=mysql_real_connect(mysql,host,user,passwd,NullS,0,NullS,0)))
|
||||
{
|
||||
if (mysql->free_me)
|
||||
my_free((gptr) mysql,MYF(0));
|
||||
}
|
||||
DBUG_RETURN(res);
|
||||
}
|
||||
}
|
||||
|
||||
static inline int mysql_init_charset(MYSQL *mysql)
|
||||
{
|
||||
char charset_name_buff[16], *charset_name;
|
||||
|
|
Loading…
Reference in a new issue