Commit 587c27e1 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

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

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
parents 9ffd927e de0d55ed

mysys/default.c

+12 −3
Original line number Diff line number Diff line
@@ -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() \