Commit c6e85ac8 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
parents 614fb882 c705f0c2

mysys/default.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, 
    defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));



  if (forced_extra_defaults)

    defaults_extra_file= forced_extra_defaults;

    defaults_extra_file= (char *) forced_extra_defaults;

  

  /*

    We can only handle 'defaults-group-suffix' if we are called from