summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-14 12:38:52 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-14 12:38:52 +0300
commit20fa2509597fd1279dd6246a7863394a2a95d268 (patch)
tree2fab415653e15437394c4ba9dcb161ffda86bc09
parent79241584962560567a353f53e92413398d38c971 (diff)
downloadmariadb-git-20fa2509597fd1279dd6246a7863394a2a95d268.tar.gz
Change version to 10.6.0
-rw-r--r--VERSION6
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_star.result2
2 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 1e22eca94bc..7d9af98fab3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=10
-MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=4
-SERVER_MATURITY=beta
+MYSQL_VERSION_MINOR=6
+MYSQL_VERSION_PATCH=0
+SERVER_MATURITY=alpha
diff --git a/mysql-test/suite/sys_vars/r/sysvars_star.result b/mysql-test/suite/sys_vars/r/sysvars_star.result
index b03e288f04e..b8a49a089b4 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 alpha
+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