← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.c

  • Committer: Brian Aker
  • Date: 2008-10-30 05:49:59 UTC
  • mfrom: (520.4.29 devel)
  • Revision ID: brian@tangent.org-20081030054959-7tlt3rxzbtl1lyin
Merge Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.c
938
938
 
939
939
  @details
940
940
    1. /etc/
941
 
    2. /etc/mysql/
 
941
    2. /etc/drizzle/
942
942
    3. --sysconfdir=<path> (compile-time option)
943
943
    4. getenv(DEFAULT_HOME_ENV)
944
944
    5. --defaults-extra-file=<path> (run-time option)
949
949
{
950
950
  memset(default_directories, 0, sizeof(default_directories));
951
951
  ADD_DIRECTORY("/etc/");
952
 
  ADD_DIRECTORY("/etc/mysql/");
 
952
  ADD_DIRECTORY("/etc/drizzle/");
953
953
#if defined(DEFAULT_SYSCONFDIR)
954
954
    ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
955
955
#endif