MDEV-26226 Change Maturity of plugins inet6 and s3 to stable

vuvova · vuvova · commit a49f5525bbe1 · 2021-07-28T23:18:46.000+02:00
from gamma
diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf
@@ -2,7 +2,6 @@
 !include include/default_client.cnf
 
 [mysqld.1]
-plugin-maturity = gamma
 plugin-load-add=@ENV.HA_S3_SO
 s3=ON
 s3-host-name=@ENV.S3_HOST_NAME
diff --git a/mysql-test/suite/s3/slave.cnf b/mysql-test/suite/s3/slave.cnf
@@ -1,5 +1,4 @@
 [mysqld.2]
-plugin-maturity = gamma
 plugin-load-add=@ENV.HA_S3_SO
 s3=ON
 s3-slave-ignore-updates=1
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
@@ -24,7 +24,7 @@ PLUGIN_TYPE	DATA TYPE
 PLUGIN_AUTHOR	MariaDB Corporation
 PLUGIN_DESCRIPTION	Data type INET6
 PLUGIN_LICENSE	GPL
-PLUGIN_MATURITY	Gamma
+PLUGIN_MATURITY	Stable
 PLUGIN_AUTH_VERSION	1.0
 #
 # End of 10.5 tests
diff --git 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_GAMMA // Maturity(see include/mysql/plugin.h)*/
+  MariaDB_PLUGIN_MATURITY_STABLE// Maturity(see include/mysql/plugin.h)*/
 },
 {
   MariaDB_FUNCTION_PLUGIN,      // the plugin type (see include/mysql/plugin.h)
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
@@ -1111,6 +1111,6 @@ maria_declare_plugin(s3)
   status_variables,             /* status variables */
   system_variables,             /* system variables */
   "1.0",                        /* string version   */
-  MariaDB_PLUGIN_MATURITY_GAMMA /* maturity         */
+  MariaDB_PLUGIN_MATURITY_STABLE/* maturity         */
 }
 maria_declare_plugin_end;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`[mysqld.2]`
`2`		`-plugin-maturity = gamma`
`3`	`2`	`plugin-load-add=@ENV.HA_S3_SO`
`4`	`3`	`s3=ON`
`5`	`4`	`s3-slave-ignore-updates=1`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ PLUGIN_TYPE DATA TYPE`
`24`	`24`	`PLUGIN_AUTHOR MariaDB Corporation`
`25`	`25`	`PLUGIN_DESCRIPTION Data type INET6`
`26`	`26`	`PLUGIN_LICENSE GPL`
`27`		`-PLUGIN_MATURITY Gamma`
	`27`	`+PLUGIN_MATURITY Stable`
`28`	`28`	`PLUGIN_AUTH_VERSION 1.0`
`29`	`29`	`#`
`30`	`30`	`# End of 10.5 tests`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ maria_declare_plugin(type_inet)`
`186`	`186`	`NULL, // Status variables`
`187`	`187`	`NULL, // System variables`
`188`	`188`	`"1.0", // String version representation`
`189`		`- MariaDB_PLUGIN_MATURITY_GAMMA // Maturity(see include/mysql/plugin.h)*/`
	`189`	`+ MariaDB_PLUGIN_MATURITY_STABLE// Maturity(see include/mysql/plugin.h)*/`
`190`	`190`	`},`
`191`	`191`	`{`
`192`	`192`	`MariaDB_FUNCTION_PLUGIN, // the plugin type (see include/mysql/plugin.h)`
Original file line number	Diff line number	Diff line change
`@@ -1111,6 +1111,6 @@ maria_declare_plugin(s3)`
`1111`	`1111`	`status_variables, /* status variables */`
`1112`	`1112`	`system_variables, /* system variables */`
`1113`	`1113`	`"1.0", /* string version */`
`1114`		`- MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */`
	`1114`	`+ MariaDB_PLUGIN_MATURITY_STABLE/* maturity */`
`1115`	`1115`	`}`
`1116`	`1116`	`maria_declare_plugin_end;`