Bug#22573767: MYSQLD --VERBOSE --HELP TRIES TO INITIALIZE KEYRING FILE

Problem: If a plugin is provided through --early-plugin-load,
         server tries to initialize it even if --help is specified.

Solution: Skip plugin initialization if --help is used.

Reviewed-By: Georgi Kodinov <[email protected]>
(cherry picked from commit fc3e3d23729763a024e6473e72444357b8f899d4)

Author: harinvadodaria

mysql-test/t/help_verbose.test

@@ -15,7 +15,7 @@
 
 --mkdir $BUGDIR
 
---exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR --secure-file-priv="" --early_plugin_load="" > $LOG_FILE 2>&1
+--exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR --secure-file-priv="" $KEYRING_PLUGIN_OPT > $LOG_FILE 2>&1
 
 --echo # There should be no errors
 --let SEARCH_FILE=    $LOG_FILE
@@ -37,7 +37,7 @@
 --mkdir $BUGDIR
 --mkdir $TEST_DATADIR
 
---exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" --early_plugin_load="" > $LOG_FILE 2>&1
+--exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" $KEYRING_PLUGIN_OPT > $LOG_FILE 2>&1
 
 --echo # There should be no errors
 --let SEARCH_FILE=    $LOG_FILE
@@ -62,7 +62,7 @@
 
 --mkdir $BUGDIR
 
---exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" --early_plugin_load="" > $LOG_FILE 2>&1
+--exec $MYSQLD --no-defaults --help --verbose --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" $KEYRING_PLUGIN_OPT > $LOG_FILE 2>&1
 
 --echo # There should be no errors
 --let SEARCH_FILE=    $LOG_FILE
@@ -84,7 +84,7 @@
 --mkdir $BUGDIR
 --mkdir $TEST_DATADIR
 
---exec $MYSQLD --no-defaults --help --verbose --log-bin --server-id=1 --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" --early_plugin_load="" > $LOG_FILE 2>&1
+--exec $MYSQLD --no-defaults --help --verbose --log-bin --server-id=1 --datadir=$TEST_DATADIR --lc-messages-dir=$MESSAGES_DIR  --secure-file-priv="" $KEYRING_PLUGIN_OPT > $LOG_FILE 2>&1
 
 --echo # There should be no errors
 --let SEARCH_FILE=    $LOG_FILE

sql/sql_plugin.cc

@@ -1446,8 +1446,11 @@ int plugin_init(int *argc, char **argv, int flags)
     while (NULL != (item= iter++))
       plugin_load_list(&tmp_root, argc, argv, item->ptr);
 
-    if (plugin_init_initialize_and_reap())
-      goto err;
+    if (!(flags & PLUGIN_INIT_SKIP_INITIALIZATION))
+    {
+      if (plugin_init_initialize_and_reap())
+        goto err;
+    }
 
     free_root(&tmp_root, MYF(0));
     init_alloc_root(key_memory_plugin_init_tmp, &tmp_root, 4096, 4096);