diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
| commit | 26aa385bc5278ec0ae842cf6558d8fd32b6876f1 (patch) | |
| tree | 57fb0c9c6c3686011b021c42671cf5065cdc0cf6 /include/my_sys.h | |
| parent | 37cedb7efad7568b496eb981e40a0910c0e22494 (diff) | |
| parent | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (diff) | |
| download | mariadb-git-26aa385bc5278ec0ae842cf6558d8fd32b6876f1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index c7c15e1606d..533d50cb25f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -260,9 +260,10 @@ extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks; extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; -extern char *defaults_extra_file; -extern const char *defaults_group_suffix; -extern const char *defaults_file; +/* from default.c */ +extern char *my_defaults_extra_file; +extern const char *my_defaults_group_suffix; +extern const char *my_defaults_file; extern my_bool timed_mutexes; |