diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
| commit | 2dfdcae3989a12e513aee2ba2df86edfb27b0e7e (patch) | |
| tree | 942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /libmysqld/libmysqld.c | |
| parent | 8f5681c91915db689a4bbfa95346705cbb51f717 (diff) | |
| parent | d9992cc79eb8c51c2b967ec60137638583a8143d (diff) | |
| download | mariadb-git-2dfdcae3989a12e513aee2ba2df86edfb27b0e7e.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
libmysqld/embedded_priv.h:
Auto merged
sql-common/client.c:
Auto merged
include/mysql.h:
merging
libmysql/libmysql.c:
merging
libmysqld/lib_sql.cc:
merging
libmysqld/libmysqld.c:
merging
sql/sql_parse.cc:
merging
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 5df61783451..1cb37e8252a 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -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; |