diff options
| author | Monty <monty@mariadb.org> | 2019-07-18 15:32:22 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-07-18 15:32:22 +0300 |
| commit | 47334649752e109360c9e22b8f8019a0df51fe93 (patch) | |
| tree | 343a69f76e7aee854ed7c8c399b94fd0a05a9465 /include/mysql_version.h.in | |
| parent | 5a95a33e309d0b2c6bc0f938ad925e3f74b0f921 (diff) | |
| download | mariadb-git-47334649752e109360c9e22b8f8019a0df51fe93.tar.gz | |
Fixed that mariadb-# binaries reads their corresponding entry from my.cnf
- Added mariadb-# to load_default_groups to all mariadb-# scripts and
mariadb-binaries.
- Added mariadbd and mariadbd-"version" to load_default_groups for the
mysqld/mariadb server
- Added mariadb-client to load_default_groups for the mysql/mariadb client
Other things
- Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version
- mysql_install_db will now automatically detect if run from srcdir
Diffstat (limited to 'include/mysql_version.h.in')
| -rw-r--r-- | include/mysql_version.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 59df2b7c086..ad719634335 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -14,6 +14,7 @@ #define MYSQL_SERVER_VERSION "@VERSION@-MariaDB" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" #define MARIADB_BASE_VERSION "mariadb-@MYSQL_BASE_VERSION@" +#define MARIADBD_BASE_VERSION "mariadbd-@MYSQL_BASE_VERSION@" #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ |