MDEV-19636 Usage message for plugin activation - add FORCE_PLUS_PERMANENT

Author: an3l

mysql-test/mysql-test-run.pl

@@ -1880,7 +1880,10 @@ sub collect_mysqld_features {
     if (/Copyright/ .. /^-{30,}/) {
       # here we want to detect all not mandatory plugins
       # they are listed in the --help output as
-      #  --archive[=name]    Enable or disable ARCHIVE plugin. Possible values are ON, OFF, FORCE (don't start if the plugin fails to load).
+      #  --archive[=name]
+      # Enable or disable ARCHIVE plugin. Possible values are ON, OFF,
+      # FORCE (don't start if the plugin fails to load),
+      # FORCE_PLUS_PERMANENT (like FORCE, but the plugin can not be uninstalled).
       push @optional_plugins, $1
         if /^  --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. One of: ON, OFF, FORCE/;
       next;

mysql-test/r/mysqld--help.result

@@ -115,7 +115,9 @@ The following specify which files/extra groups are read (specified before remain
  that this is a limit per thread!
  --changed-page-bitmaps[=name] 
  Enable or disable CHANGED_PAGE_BITMAPS plugin. One of:
- ON, OFF, FORCE (don't start if the plugin fails to load).
+ ON, OFF, FORCE (don't start if the plugin fails to load),
+ FORCE_PLUS_PERMANENT (like FORCE, but the plugin can not
+ be uninstalled).
  --character-set-client-handshake 
  Don't ignore client side character set value sent during
  handshake.

sql/sql_plugin.cc

@@ -77,7 +77,7 @@ uint plugin_maturity_map[]=
 { 0, 1, 2, 3, 4, 5, 6 };
 
 /*
-  When you ad a new plugin type, add both a string and make sure that the
+  When you add a new plugin type, add both a string and make sure that the
   init and deinit array are correctly updated.
 */
 const LEX_STRING plugin_type_names[MYSQL_MAX_PLUGIN_TYPE_NUM]=
@@ -3643,7 +3643,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
   const LEX_STRING plugin_dash = { C_STRING_WITH_LEN("plugin-") };
   uint plugin_name_len= strlen(plugin_name);
   uint optnamelen;
-  const int max_comment_len= 180;
+  const int max_comment_len= 255;
   char *comment= (char *) alloc_root(mem_root, max_comment_len + 1);
   char *optname;
 
@@ -3677,8 +3677,9 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
     options[0].typelib= options[1].typelib= &global_plugin_typelib;
 
     strxnmov(comment, max_comment_len, "Enable or disable ", plugin_name,
-            " plugin. One of: ON, OFF, FORCE (don't start "
-            "if the plugin fails to load).", NullS);
+            " plugin. One of: ON, OFF, FORCE (don't start if the plugin"
+            " fails to load), FORCE_PLUS_PERMANENT (like FORCE, but the"
+            " plugin can not be uninstalled).", NullS);
     options[0].comment= comment;
     /*
       Allocate temporary space for the value of the tristate.