11.5 branch

vuvova · vuvova · commit 04f05048312c · 2024-02-17T17:10:25.000+01:00
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=11
-MYSQL_VERSION_MINOR=4
-MYSQL_VERSION_PATCH=2
-SERVER_MATURITY=stable
+MYSQL_VERSION_MINOR=5
+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
@@ -107,7 +107,7 @@ character-set-collations = utf8mb4=uca1400_ai_ci
 # you can put MariaDB-only options here
 [mariadbd]
 
-# This group is only read by MariaDB-11.4 servers.
+# This group is only read by MariaDB-11.5 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.4]
+[mariadb-11.5]
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-mariadb (1:11.4.0) unstable; urgency=medium
+mariadb (1:11.5.0) unstable; urgency=medium
 
   * Initial Release
 
- -- Vicențiu Ciorbaru <vicentiu@mariadb.org>  Thu, 18 Jun 2021 16:08:00 +0300
+ -- Sergei Golubchik <serg@mariadb.org> Thu, 15 Feb 2024 15:05:51 +0200
diff --git 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	gamma
+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
