summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2005-09-30 12:25:39 +0200
committerjonas@perch.ndb.mysql.com <>2005-09-30 12:25:39 +0200
commitb43d0f049575b1aa91df665c7f8e18b83db14483 (patch)
treea72a7ce3e7a9010cd312bf2f74655f31ca4a25e4 /include/my_sys.h
parenta11dcd74d280164b4957c49894600f275c89d28b (diff)
parent2722dff13f9a67ae34295e471cafd317a35e2014 (diff)
downloadmariadb-git-b43d0f049575b1aa91df665c7f8e18b83db14483.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
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h1
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;