diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:44:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:44:05 +0100 |
| commit | 31aee856d83684d4f53e6037d02e1240f694e7cb (patch) | |
| tree | b6759c4bcd7a2db701145b582e202997ba869824 /mysys | |
| parent | b93d81a8d10c7a0e03ca3f114ab1ad8066465293 (diff) | |
| parent | 4660f6d5ef3381f1e0981268308fb14796707a4f (diff) | |
| download | mariadb-git-31aee856d83684d4f53e6037d02e1240f694e7cb.tar.gz | |
Merge 192.168.0.10:mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
mysys/default.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.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 424eca481b1..fadf6efbc5b 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, |