diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 12:25:39 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 12:25:39 +0200 |
| commit | d3febe80ecc561a9ac2aa5fe1c91006099b8b1d4 (patch) | |
| tree | a72a7ce3e7a9010cd312bf2f74655f31ca4a25e4 /include | |
| parent | c7853e4775cd43efd8d2436255dc8940a870255a (diff) | |
| parent | 8aebd06284160652bd14ccc6ecb52bd04ae4ba09 (diff) | |
| download | mariadb-git-d3febe80ecc561a9ac2aa5fe1c91006099b8b1d4.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
include/my_sys.h:
Auto merged
mysys/default.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index e21af78fcaa..9d8cd451c5e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -262,6 +262,7 @@ 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; extern my_bool timed_mutexes; |