From eff9c198e32a828f610b93fad3a0f0eb63b3ded2 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 14 Nov 2024 19:09:01 +0100 Subject: [PATCH] 11.8 branch --- VERSION | 6 +++--- debian/additions/mariadb.conf.d/50-server.cnf | 4 ++-- debian/changelog | 2 +- mysql-test/suite/sys_vars/r/sysvars_star.result | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index c96348cabee..c06e4921dd4 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=11 -MYSQL_VERSION_MINOR=7 -MYSQL_VERSION_PATCH=1 -SERVER_MATURITY=gamma +MYSQL_VERSION_MINOR=8 +MYSQL_VERSION_PATCH=0 +SERVER_MATURITY=alpha diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 3d80faf7dcf..3b9b1b731fd 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/debian/additions/mariadb.conf.d/50-server.cnf @@ -110,7 +110,7 @@ expire_logs_days = 10 # you can put MariaDB-only options here [mariadbd] -# This group is only read by MariaDB-11.7 servers. +# This group is only read by MariaDB-11.8 servers. # If you use the same .cnf file for MariaDB of different versions, # use this group for options that older servers don't understand -[mariadb-11.7] +[mariadb-11.8] diff --git a/debian/changelog b/debian/changelog index 2091760ec19..faf54074614 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mariadb (1:11.7.0) unstable; urgency=medium +mariadb (1:11.8.0) unstable; urgency=medium * Initial Release diff --git a/mysql-test/suite/sys_vars/r/sysvars_star.result b/mysql-test/suite/sys_vars/r/sysvars_star.result index c005a6d2ad6..d54a320afcd 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_star.result +++ b/mysql-test/suite/sys_vars/r/sysvars_star.result @@ -60,7 +60,7 @@ VARIABLE_NAME PLUGIN_MATURITY SESSION_VALUE NULL GLOBAL_VALUE alpha GLOBAL_VALUE_ORIGIN CONFIG -DEFAULT_VALUE beta +DEFAULT_VALUE experimental VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded