fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)

client/mysql.cc:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  defaults files handled
include/my_sys.h:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_file interface added
libmysqld/libmysqld.c:
  just small fix, not related to the bug.
mysys/default.c:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_files implementation
This commit is contained in:
unknown 2005-01-03 19:21:54 +04:00
commit d3be3cbcfd
4 changed files with 55 additions and 17 deletions

View file

@ -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)))