diff options
| author | monty@mysql.com <> | 2004-05-25 02:47:25 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-25 02:47:25 +0300 |
| commit | af44187bff587b9503db19cb243ff4d4b69b367e (patch) | |
| tree | cd40ef99e52fbe99be97d88ef663df2fa69b8ddb /include/mysql_version.h.in | |
| parent | f23af5e6a25b7bd1edbc52e8c7f28f22a2e0b907 (diff) | |
| parent | 0babddff40fe58ba01e2568bf1aa401e9c94fc4e (diff) | |
| download | mariadb-git-af44187bff587b9503db19cb243ff4d4b69b367e.tar.gz | |
Merge with 4.0 to get fixes for Windows project files
Diffstat (limited to 'include/mysql_version.h.in')
| -rw-r--r-- | include/mysql_version.h.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index e748ba42edc..dac7ca661d1 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -11,9 +11,7 @@ #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" -#ifndef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@" -#endif +#define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ @@ -25,11 +23,7 @@ #endif /* _CUSTOMCONFIG_ */ #ifndef LICENSE -#ifdef MYSQL_COMMERICAL_LICENSE -#define LICENSE "Commerical" -#else -#define LICENSE "GPL" -#endif +#define LICENSE GPL #endif /* LICENSE */ #endif /* _mysql_version_h */ |