database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Have mariadbd server read [mariadb-X] and [mariadb-X] sections

Browse Source 
X is major version, like mariadb-11 and mariadbd-11

This simplifies my.cnf files supporting many MariaDB versions
This commit is contained in:
Monty
2026-02-04 15:52:32 +02:00
parent 5e541901ec
commit 16633ac421
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql_version.h.in
View File

@@ -14,7 +14,9 @@
#define MYSQL_SERVER_VERSION "@VERSION@-MariaDB"
#define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@"
#define MARIADB_BASE_VERSION "mariadb-@MYSQL_BASE_VERSION@"
#define MARIADB_MAJOR_VERSION "mariadb-@MAJOR_VERSION@"
#define MARIADBD_BASE_VERSION "mariadbd-@MYSQL_BASE_VERSION@"
#define MARIADBD_MAJOR_VERSION "mariadbd-@MAJOR_VERSION@"
#define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@"
#define FRM_VER @DOT_FRM_VERSION@
#define MYSQL_VERSION_ID @MYSQL_VERSION_ID@

4
include/mysqld_default_groups.h
View File

@@ -1,7 +1,7 @@
const char *load_default_groups[]= {
"mysqld", "server", MYSQL_BASE_VERSION,
"mariadb", MARIADB_BASE_VERSION,
"mariadbd", MARIADBD_BASE_VERSION,
"mariadb", MARIADB_BASE_VERSION, MARIADB_MAJOR_VERSION,
"mariadbd", MARIADBD_BASE_VERSION, MARIADBD_MAJOR_VERSION,
"client-server",
#ifdef WITH_WSREP
"galera",