diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
| commit | 008dd95f70a53335f7979e553f7178dfce2565ab (patch) | |
| tree | 3225891d5cfadb66f761de37a6ec8f85ca6ac751 /include/config-win.h | |
| parent | 4e95179af9c2f2589093ea9f94472d8d047892c7 (diff) | |
| parent | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff) | |
| download | mariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz | |
Auto-merge
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index ce8c0fd17ee..af4915440b1 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -313,13 +313,15 @@ inline ulonglong double2ulonglong(double d) #ifdef _CUSTOMCONFIG_ #include <custom_conf.h> #else +#ifndef CMAKE_CONFIGD #define DEFAULT_MYSQL_HOME "c:\\mysql" -#define DATADIR "c:\\mysql\\data" +#define MYSQL_DATADIR "c:\\mysql\\data" #define PACKAGE "mysql" #define DEFAULT_BASEDIR "C:\\" #define SHAREDIR "share" #define DEFAULT_CHARSET_HOME "C:/mysql/" #endif +#endif #ifndef DEFAULT_HOME_ENV #define DEFAULT_HOME_ENV MYSQL_HOME #endif |