diff --git a/VERSION b/VERSION index 0f14be28c66..02785df9b53 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=12 -MYSQL_VERSION_MINOR=0 -MYSQL_VERSION_PATCH=1 -SERVER_MATURITY=gamma +MYSQL_VERSION_MINOR=1 +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 32d65931f61..3f2a063a164 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-12.0 servers. +# This group is only read by MariaDB-12.1 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-12.0] +[mariadb-12.1] diff --git a/debian/changelog b/debian/changelog index 45c6112e36a..aaa81834242 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mariadb (1:12.0.0) unstable; urgency=medium +mariadb (1:12.1.0) unstable; urgency=medium * Initial Release - -- Sergei Golubchik Tue Aug 20 08:40:21 CEST 2024 + -- Sergei Golubchik Mon Apr 28 10:19:29 CEST 2025 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