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 | 8ef28b496230ab67630dbe4a9adf3c217690b425 (patch) | |
| tree | 3225891d5cfadb66f761de37a6ec8f85ca6ac751 /include | |
| parent | e642140b182e4ba0688b91c0870dfb5500b149f0 (diff) | |
| parent | 6df2af22ceda4a59fc43a661f6ecfac362e9783a (diff) | |
| download | mariadb-git-8ef28b496230ab67630dbe4a9adf3c217690b425.tar.gz | |
Auto-merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-netware.h | 2 | ||||
| -rw-r--r-- | include/config-win.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index e6bddee034e..4b9e1437170 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -131,7 +131,7 @@ extern "C" { #define DEFAULT_BASEDIR "sys:/" #define SHAREDIR "share/" #define DEFAULT_CHARSET_HOME "sys:/mysql/" -#define DATADIR "data/" +#define MYSQL_DATADIR "data/" /* 64-bit file system calls */ #define SIZEOF_OFF_T 8 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 |