diff options
| author | monty@mysql.com <> | 2004-05-19 16:38:12 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-19 16:38:12 +0300 |
| commit | 86a966256be6818d20d138c1e687e1f195ddaf74 (patch) | |
| tree | 8d62bd5b112fa2148c1631a51cc9fa272dcf5d16 /include | |
| parent | fdc0f0e781051150ac187a92df1ff8f9ae3286c7 (diff) | |
| download | mariadb-git-86a966256be6818d20d138c1e687e1f195ddaf74.tar.gz | |
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 1 | ||||
| -rw-r--r-- | include/mysql_embed.h | 3 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/m_string.h b/include/m_string.h index 934ad1c42b5..eb2758ec506 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -232,6 +232,7 @@ extern char *str2int(const char *src,int radix,long lower,long upper, #if SIZEOF_LONG == SIZEOF_LONG_LONG #define longlong2str(A,B,C) int2str((A),(B),(C)) #define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C)) +#undef strtoll #define strtoll(A,B,C) strtol((A),(B),(C)) #define strtoull(A,B,C) strtoul((A),(B),(C)) #ifndef HAVE_STRTOULL diff --git a/include/mysql_embed.h b/include/mysql_embed.h index bc75c3fbcb8..a061e68a974 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -28,7 +28,4 @@ #define DONT_USE_RAID -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-embedded" - #endif /* EMBEDDED_LIBRARY */ diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index de5294a82cf..4ccc4ee1e45 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -28,7 +28,11 @@ #endif /* _CUSTOMCONFIG_ */ #ifndef LICENSE -#define LICENSE "GPL" +#ifdef MYSQL_COMMERICAL_LICENSE +#define LICENSE "Commerical" +#else +#define LICENSE "GPL" +#endif #endif /* LICENSE */ #endif /* _mysql_version_h */ |