mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build

Browse source 
into  trift2.:/MySQL/M51/push-5.1
This commit is contained in:
joerg@trift2. 2007-11-19 23:03:43 +01:00
commit be638f606f
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysys/default.c
View file

@ -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() \