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

Merge mysql.com:/home/hf/work/mysql-4.1.mrg

Browse Source 
into  mysql.com:/home/hf/work/mysql-5.0.mrg
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none)
2006-07-18 14:52:29 +05:00
parent 14519de0fc eddaafb12b
commit bed7b69243
8 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmysqld/libmysqld.c
View File

@ -97,7 +97,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
const char *passwd, const char *db,
uint port, const char *unix_socket,ulong client_flag)
{
char *db_name;
char name_buff[USERNAME_LENGTH];
DBUG_ENTER("mysql_real_connect");
@ -178,12 +177,12 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
mysql->info_buffer= my_malloc(MYSQL_ERRMSG_SIZE, MYF(0));
mysql->thd= create_embedded_thd(client_flag, db_name);
init_embedded_mysql(mysql, client_flag, db_name);
init_embedded_mysql(mysql, client_flag);
if (mysql_init_character_set(mysql))
goto error;
if (check_embedded_connection(mysql))
if (check_embedded_connection(mysql, db))
goto error;
mysql->server_status= SERVER_STATUS_AUTOCOMMIT;