diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-07-18 16:43:39 +0500 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-07-18 16:43:39 +0500 |
| commit | 00f56da9af79e19ec457a03044542117f222049e (patch) | |
| tree | ce08bf51020b326c89464a97bbda2af70a64ecc3 /libmysqld | |
| parent | bed7b69243cf04bfde409222285b563596c6f359 (diff) | |
| download | mariadb-git-00f56da9af79e19ec457a03044542117f222049e.tar.gz | |
merging
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 14 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 5fc0a007921..2640910990e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -387,20 +387,6 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql) return mysql_store_result(mysql); } -my_bool emb_next_result(MYSQL *mysql) -{ - THD *thd= (THD*)mysql->thd; - DBUG_ENTER("emb_next_result"); - - if (emb_advanced_command(mysql, COM_QUERY,0,0, - thd->query_rest.ptr(),thd->query_rest.length(), - 1, NULL) || - emb_mysql_read_query_result(mysql)) - DBUG_RETURN(1); - - DBUG_RETURN(0); /* No more results */ -} - int emb_read_change_user_result(MYSQL *mysql, char *buff __attribute__((unused)), const char *passwd __attribute__((unused))) diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 1cb37e8252a..cb4fa104b4c 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -164,7 +164,6 @@ 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; /* Send client information for access check */ client_flag|=CLIENT_CAPABILITIES; @@ -175,7 +174,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, client_flag|=CLIENT_CONNECT_WITH_DB; mysql->info_buffer= my_malloc(MYSQL_ERRMSG_SIZE, MYF(0)); - mysql->thd= create_embedded_thd(client_flag, db_name); + mysql->thd= create_embedded_thd(client_flag); init_embedded_mysql(mysql, client_flag); |