diff options
| author | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
| commit | 5b6c1348c737ddf705800c3f734c25349d0ca841 (patch) | |
| tree | 2a23167b636e05bfda983614bbee36653c7c2c12 /include | |
| parent | abde46de62241a722f4e17d2b1d820d1d496b582 (diff) | |
| parent | 68b4d7b74d80062b09edfdaeb7137c74b3071346 (diff) | |
| download | mariadb-git-5b6c1348c737ddf705800c3f734c25349d0ca841.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_select.cc:
Auto merged
mysys/default.c:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index 2559b3b74fd..6e0740497b0 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -353,6 +353,9 @@ inline double ulonglong2double(ulonglong value) #ifndef DEFAULT_HOME_ENV #define DEFAULT_HOME_ENV MYSQL_HOME #endif +#ifndef DEFAULT_GROUP_SUFFIX_ENV +#define DEFAULT_GROUP_SUFFIX_ENV MYSQL_GROUP_SUFFIX +#endif /* File name handling */ diff --git a/include/my_sys.h b/include/my_sys.h index e31659c0652..4c385e9d1b3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -263,7 +263,7 @@ extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern char *defaults_extra_file; -extern const char *defaults_instance; +extern const char *defaults_group_suffix; extern my_bool timed_mutexes; @@ -785,8 +785,9 @@ extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size, extern char *strdup_root(MEM_ROOT *root,const char *str); extern char *strmake_root(MEM_ROOT *root,const char *str,uint len); extern char *memdup_root(MEM_ROOT *root,const char *str,uint len); -extern void get_defaults_files(int argc, char **argv, - char **defaults, char **extra_defaults); +extern int get_defaults_options(int argc, char **argv, + char **defaults, char **extra_defaults, + char **group_suffix); extern int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); extern int modify_defaults_file(const char *file_location, const char *option, |