diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:26:12 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:26:12 -0500 |
| commit | 70fe372a2c05439566f8f5a73a55923daa9a62a6 (patch) | |
| tree | feb686c0068723f2beea793f7b47d40c4afa8d34 /mysys | |
| parent | 659a1255afcc515c731e507963a54bbd5b45e2cf (diff) | |
| parent | 539465508ca3f11c0793b6dd4772a2520009b913 (diff) | |
| download | mariadb-git-70fe372a2c05439566f8f5a73a55923daa9a62a6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 1d71399ef71..6e40c48d82a 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -49,7 +49,6 @@ const char *default_directories[]= { "sys:/etc/", #else "/etc/", -"/etc/mysql/", #endif #ifdef DATADIR DATADIR, |