diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 15:29:01 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 15:29:01 +0300 |
| commit | 972da434a0043089b30e0de34ced367af3ab9ce1 (patch) | |
| tree | c298d66f44c0e962d1795971f31ba9ca0897efdc /include | |
| parent | 4dd483591c608621e6f631f8db4a1dbed2c62f23 (diff) | |
| parent | 1d31ee29fd78a4fbcf74da0271146fad3d0bc044 (diff) | |
| download | mariadb-git-972da434a0043089b30e0de34ced367af3ab9ce1.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
include/my_sys.h:
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 0a752e7b225..422bd171eb5 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; |