diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-21 19:52:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-21 19:52:49 +0200 |
| commit | ad436d9221600f68bb803c943eb05ffb19d76488 (patch) | |
| tree | ccfeeb3f674e67c064cb58a83432a5e259db1256 /plugin | |
| parent | 8c68b54981bf749db550a11fb0d1799a40879a0a (diff) | |
| parent | 39378e1366f78b38c05e45103b9fb9c829cc5f4f (diff) | |
| download | mariadb-git-ad436d9221600f68bb803c943eb05ffb19d76488.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result | 2 | ||||
| -rw-r--r-- | plugin/type_inet/plugin.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result index 931c66fd9d2..a51d0f0dd39 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result @@ -24,7 +24,7 @@ PLUGIN_TYPE DATA TYPE PLUGIN_AUTHOR MariaDB Corporation PLUGIN_DESCRIPTION Data type INET6 PLUGIN_LICENSE GPL -PLUGIN_MATURITY Beta +PLUGIN_MATURITY Gamma PLUGIN_AUTH_VERSION 1.0 # # End of 10.5 tests diff --git a/plugin/type_inet/plugin.cc b/plugin/type_inet/plugin.cc index 55052df80dd..2baa98f0594 100644 --- a/plugin/type_inet/plugin.cc +++ b/plugin/type_inet/plugin.cc @@ -186,7 +186,7 @@ maria_declare_plugin(type_inet) NULL, // Status variables NULL, // System variables "1.0", // String version representation - MariaDB_PLUGIN_MATURITY_BETA // Maturity(see include/mysql/plugin.h)*/ + MariaDB_PLUGIN_MATURITY_GAMMA // Maturity(see include/mysql/plugin.h)*/ }, { MariaDB_FUNCTION_PLUGIN, // the plugin type (see include/mysql/plugin.h) |