diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-14 09:16:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-02-14 09:16:30 +0100 |
| commit | dd87a8b316593d33d19b8c7cd486991910a5b501 (patch) | |
| tree | 340d9bb0cc861696f4b7d49ab3a9d040a1d70096 | |
| parent | f8a9f906679e1d1ab026c245f7d24c652050d8b3 (diff) | |
| parent | 6dc46b5a4d8aa5432528745be3174267a9caa74d (diff) | |
| download | mariadb-git-dd87a8b316593d33d19b8c7cd486991910a5b501.tar.gz | |
Merge commit 'bb-10.5-release' into 10.5
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_star.result | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=1 -SERVER_MATURITY=alpha +SERVER_MATURITY=beta diff --git a/mysql-test/suite/sys_vars/r/sysvars_star.result b/mysql-test/suite/sys_vars/r/sysvars_star.result index b8a49a089b4..b03e288f04e 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 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 |