Merge commit 'bb-10.5-release' into 10.5

dd87a8b3 · Sergei Golubchik · f8a9f906 · 6dc46b5a · dd87a8b3 · dd87a8b3
Commit dd87a8b3 authored Feb 14, 2020 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

VERSION VERSION +1 -1

mysql-test/suite/sys_vars/r/sysvars_star.result mysql-test/suite/sys_vars/r/sysvars_star.result +1 -1

No files found.
--- a/VERSION
+++ b/VERSION
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=1
-SERVER_MATURITY=alpha
+SERVER_MATURITY=beta
--- 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	experimental
+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