merge with 4.0.15

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

1 files changed, 6 insertions, 6 deletions

diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 48b3397ee7c..05e5ff59b55 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -210,11 +210,9 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 		      db ? db : "(Null)",
 		      user ? user : "(Null)"));
 
-  if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION)
-    cli_mysql_real_connect(mysql, host, user, 
-			   passwd, db, port, unix_socket, client_flag);
-  if ((mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION) &&
-      host && strcmp(host,LOCAL_HOST))
+  if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION ||
+      (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION &&
+       host && strcmp(host,LOCAL_HOST)))
     cli_mysql_real_connect(mysql, host, user, 
 			   passwd, db, port, unix_socket, client_flag);
 
@@ -277,7 +275,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
   DBUG_RETURN(mysql);
 
 error:
-  DBUG_PRINT("error",("message: %u (%s)",mysql->net.last_errno,mysql->net.last_error));
+  DBUG_PRINT("error",("message: %u (%s)", mysql->net.last_errno,
+		      mysql->net.last_error));
   {
     /* Free alloced memory */
     my_bool free_me=mysql->free_me;
@@ -289,6 +288,7 @@ error:
   DBUG_RETURN(0);
 }
 
+
 /*************************************************************************
 ** Send a QUIT to the server and close the connection
 ** If handle is alloced by mysql connect free it.