diff options
author | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
---|---|---|
committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
commit | 26c389b7b770a3699ec1fc81df7f379f6084c9e6 (patch) | |
tree | 7f915e858b211834deeb52928dfdf5ab12b24bfe /sql/sql_plugin.cc | |
parent | b9557418ccd9f484806515fba030757274e691f2 (diff) | |
parent | fd08f953222b854428dc259631e8fc707fe34619 (diff) | |
download | mariadb-git-26c389b7b770a3699ec1fc81df7f379f6084c9e6.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r-- | sql/sql_plugin.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 29cc4d17c87..19c0f508939 100644 --- a/sql/sql_plugin.cc +++ b/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]= @@ -3664,7 +3664,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; @@ -3698,8 +3698,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. |