From 4ae97333f08b58d1934e0c7804732e7ad2eca39b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 8 Mar 2023 19:50:40 +0100 Subject: [PATCH] 11.1 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 26f2d389e50..e4fc40e639e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=11 -MYSQL_VERSION_MINOR=0 -MYSQL_VERSION_PATCH=2 -SERVER_MATURITY=gamma +MYSQL_VERSION_MINOR=1 +MYSQL_VERSION_PATCH=0 +SERVER_MATURITY=beta diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 6dcfe16cd55..2d7a176471a 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/debian/additions/mariadb.conf.d/50-server.cnf @@ -108,7 +108,7 @@ collation-server = utf8mb4_general_ci # you can put MariaDB-only options here [mariadbd] -# This group is only read by MariaDB-11.0 servers. +# This group is only read by MariaDB-11.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-11.0] +[mariadb-11.1] diff --git a/debian/changelog b/debian/changelog index 60ef886f6dd..1f9f854d829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mariadb (1:11.0.0) unstable; urgency=medium +mariadb (1:11.1.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 b3357fda3af..b4c0ea87581 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 alpha VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded