diff options
author | unknown <jimw@mysql.com> | 2006-05-01 11:38:15 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2006-05-01 11:38:15 -0700 |
commit | 839a5dea8672091fd5a96cef5dff8934d938884b (patch) | |
tree | e40a050be0bf936cff10d68680df4bf5d7f5cbea /include/config-win.h | |
parent | ae75af8cb75ccd088121e1fe3b01a0090a11808b (diff) | |
parent | 71b3a5aa3549219f4992176483244664f9a72a0f (diff) | |
download | mariadb-git-839a5dea8672091fd5a96cef5dff8934d938884b.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
Diffstat (limited to 'include/config-win.h')
-rw-r--r-- | include/config-win.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index b6fb1077cc6..6d0f40adbd3 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -382,6 +382,7 @@ inline double ulonglong2double(ulonglong value) #include <custom_conf.h> #else #define DEFAULT_MYSQL_HOME "c:\\mysql" +#define DATADIR "c:\\mysql\\data" #define PACKAGE "mysql" #define DEFAULT_BASEDIR "C:\\" #define SHAREDIR "share" |