summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2019-06-10 09:07:49 -0700
committerRobert Bindar <robert@mariadb.org>2019-07-02 12:03:39 +0300
commitbf37b9fce9fc1cfb3fe096bc50c15c1bf53cd629 (patch)
tree1eb536ac7ed7f4c11b3d3f7e735c19672bde176a /mysql-test/mysql-test-run.pl
parentb105427745dbf6bd2c69469f8cb66502a7a3f749 (diff)
downloadmariadb-git-bf37b9fce9fc1cfb3fe096bc50c15c1bf53cd629.tar.gz
MDEV-19636 Usage message for plugin activation - add FORCE_PLUS_PERMANENT
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7891af205b8..f9906a99b09 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/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;