diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
| commit | a8de8f261d1b7621b8e16396e87dfaac14891162 (patch) | |
| tree | 9b8ec45858c2757305e0bdecf237fcb59251020c /include/mysql_version.h.in | |
| parent | e183aec1d75ea7b424ebe237e6b1643961903f2d (diff) | |
| parent | 42e1815ad850384fad292534665ff61b78dd96f6 (diff) | |
| download | mariadb-git-a8de8f261d1b7621b8e16396e87dfaac14891162.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'include/mysql_version.h.in')
| -rw-r--r-- | include/mysql_version.h.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 59df2b7c086..da572953fc5 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -17,13 +17,16 @@ #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@ +#define MARIADB_PORT @MYSQL_TCP_PORT@ #define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ -#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" +#define MARIADB_UNIX_ADDR "@MYSQL_UNIX_ADDR@" #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" #define SERVER_MATURITY_LEVEL @SERVER_MATURITY_LEVEL@ +#define MYSQL_PORT MARIADB_PORT +#define MYSQL_UNIX_ADDR MARIADB_UNIX_ADDR + #ifdef WITH_WSREP #define WSREP_PATCH_VERSION "@WSREP_PATCH_VERSION@" #endif |