diff options
| author | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
| commit | 196c95e938ecced55a9fb0931fb5c9fb564d6866 (patch) | |
| tree | a016853c9385e1555657e606886d3588657139ab /libmysqld | |
| parent | ee72592bfddf9522d1d08db5daf4e12e78f22661 (diff) | |
| parent | 2bd854c859c347156c39171d3d82e96608b87068 (diff) | |
| download | mariadb-git-196c95e938ecced55a9fb0931fb5c9fb564d6866.tar.gz | |
Merging conflicts resolved
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 5 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index ffbde84f673..353f8cd6430 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -219,12 +219,13 @@ static my_bool emb_mysql_read_query_result(MYSQL *mysql) static int emb_stmt_execute(MYSQL_STMT *stmt) { DBUG_ENTER("emb_stmt_execute"); + char header[4]; + int4store(header, stmt->stmt_id); THD *thd= (THD*)stmt->mysql->thd; thd->client_param_count= stmt->param_count; thd->client_params= stmt->params; if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0, - (const char*)&stmt->stmt_id,sizeof(stmt->stmt_id), - 1) || + header, sizeof(header), 1) || emb_mysql_read_query_result(stmt->mysql)) { NET *net= &stmt->mysql->net; diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index a2c4be1a078..6fa41fb3fd0 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -143,6 +143,9 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, db ? db : "(Null)", user ? user : "(Null)")); + if (!host || !host[0]) + host= mysql->options.host; + if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION || (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION && host && *host && strcmp(host,LOCAL_HOST))) |