diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-13 22:32:18 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-13 22:32:18 +0500 |
| commit | d9992cc79eb8c51c2b967ec60137638583a8143d (patch) | |
| tree | d0abbb795b7f5dca489bba6673a69c87d67e9832 /libmysqld/libmysqld.c | |
| parent | 1787072458f518c68b940f17f54f2b5658f45469 (diff) | |
| parent | eadcf20081b18b28f344552a9902fea2404d55bd (diff) | |
| download | mariadb-git-d9992cc79eb8c51c2b967ec60137638583a8143d.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.16017
include/sql_common.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/libmysqld.c:
merging
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index a2bd4242c3d..0b21d11df31 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -92,7 +92,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"); @@ -155,16 +154,14 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, port=0; unix_socket=0; - db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL; + mysql->thd= create_embedded_thd(client_flag); - 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; /* Send client information for access check */ |