diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-29 11:26:46 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-29 11:26:46 -0400 |
commit | 903cfde149778daf67d21144a1172e1ef998599e (patch) | |
tree | 9c9e1e5d60a8b8b4b8a69ba89d364a471f3e692e /include/mysql_version.h.in | |
parent | 1b00edc49a2f1e0a1995fc0562639d90d4c19ca2 (diff) | |
download | mariadb-git-903cfde149778daf67d21144a1172e1ef998599e.tar.gz |
MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabled
* mysqld_safe: Since wsrep_on variable is mandatory in 10.1, skip wsrep
position recovery if its OFF.
* mysqld: Remove "-wsrep" from server version
* mysqld: Remove wsrep patch version from @@version_comment
* mysqld: Introduce @@wsrep_patch_version
Diffstat (limited to 'include/mysql_version.h.in')
-rw-r--r-- | include/mysql_version.h.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index cceb4e984c7..f22e00dabb9 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -23,6 +23,10 @@ #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" +#ifdef WITH_WSREP +#define WSREP_PATCH_VERSION "@WSREP_PATCH_VERSION@" +#endif + /* mysqld compile time options */ #endif /* _CUSTOMCONFIG_ */ |