diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-16 14:57:47 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-16 14:57:47 -0700 |
| commit | 7f99a2db29f73af4d24548a5e9ec5f1aa72c8eb0 (patch) | |
| tree | 3969b99d4c021fae33e8bfc27a178979d585e449 /mysys/default.c | |
| parent | 9395439cfa4297953f08df53e3dbbb5e445a136e (diff) | |
| parent | 975731aa32e5e641a53140ada4b1a3d5d325d6f5 (diff) | |
| download | mariadb-git-7f99a2db29f73af4d24548a5e9ec5f1aa72c8eb0.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
Diffstat (limited to 'mysys/default.c')
| -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 a24f6583004..e58903d6d64 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -928,13 +928,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() \ |