diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-19 13:40:49 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-19 13:40:49 -0700 |
| commit | b5cd212445e29655e70573789ae7854c6a2fd025 (patch) | |
| tree | 17d923f0fcf78276493874cb2fd15f8d1e243209 /mysys | |
| parent | 74e811cdad201928fdc5eec414dd2005c1fcae17 (diff) | |
| parent | 29d7b2456c952c1e1c484876ecfa5349d539720f (diff) | |
| download | mariadb-git-b5cd212445e29655e70573789ae7854c6a2fd025.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
mysys/default.c:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index 1ff052d3d24..2758029ec12 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -937,13 +937,22 @@ void print_defaults(const char *conf_file, const char **groups) #include <help_end.h> +/* + This extra complexity is to avoid declaring 'rc' if it won't be + used. +*/ +#define ADD_DIRECTORY_INTERNAL(DIR) \ + array_append_string_unique((DIR), default_directories, \ + array_elements(default_directories)) +#ifdef DBUG_OFF +# define ADD_DIRECTORY(DIR) (void) ADD_DIRECTORY_INTERNAL(DIR) +#else #define ADD_DIRECTORY(DIR) \ do { \ - my_bool rc= \ - array_append_string_unique((DIR), default_directories, \ - array_elements(default_directories)); \ + my_bool rc= ADD_DIRECTORY_INTERNAL(DIR); \ DBUG_ASSERT(rc == FALSE); /* Success */ \ } while (0) +#endif #define ADD_COMMON_DIRECTORIES() \ |