diff options
| author | hf@deer.(none) <> | 2005-01-11 19:58:52 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2005-01-11 19:58:52 +0400 |
| commit | 8b3b36489302b5a9b8b98b32e5a274297d6f2343 (patch) | |
| tree | 095235bf3a804e1c93be2744d8bb43a05ba6091a /libmysqld | |
| parent | 33795908a07e2cb2d3dfb7073e3e8806c0f8124a (diff) | |
| parent | 5eb5fd12be42918f6e93391068d620554c11a08d (diff) | |
| download | mariadb-git-8b3b36489302b5a9b8b98b32e5a274297d6f2343.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysqld.c | 3 |
1 files changed, 3 insertions, 0 deletions
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))) |