Commit 106e1204 authored by unknown's avatar unknown
Browse files

merge

parents 6a0e1def f6834a5d

mysys/default.c

+8 −2
Original line number Diff line number Diff line
@@ -171,9 +171,12 @@ int load_defaults(const char *conf_file, const char **groups, 
  {

    if ((error= search_default_file_with_ext(&args, &alloc, "", "",

					     forced_default_file, 

					     &group)) < 0)

					     &group)))

    {

      fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);

      goto err;

    }

  }

  else if (dirname_length(conf_file))

  {

    if ((error= search_default_file(&args, &alloc, NullS, conf_file,
@@ -208,11 +211,14 @@ int load_defaults(const char *conf_file, const char **groups, 
      else if (defaults_extra_file)

      {

	if (search_default_file(&args, &alloc, NullS, defaults_extra_file,

				&group) < 0)

                                &group))

        {

          fprintf(stderr, "Error reading '%s' file.\n", defaults_extra_file);

	  goto err;				/* Fatal error */

        }

      }

    }

  }

  /*

    Here error contains <> 0 only if we have a fully specified conf_file

    or a forced default file