Auto-merge from mysql-next-mr-bugfixing.

1 files changed, 10 insertions, 6 deletions

diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc
index 3c8d19107c9..e318823d8af 100644
--- a/mysql-test/include/mysqld--help.inc
+++ b/mysql-test/include/mysqld--help.inc
@@ -10,24 +10,28 @@
 exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1;
 
 perl;
-  @skipvars=qw/basedir open-files-limit general-log-file log
+  @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
                log-slow-queries pid-file slow-query-log-file
-               datadir slave-load-tmpdir tmpdir/;
-  @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool ssl des-key-file
-              thread-concurrency super-large-pages mutex-deadlock-detector/;
-  @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/;
+			   datadir slave-load-tmpdir tmpdir/;
+  @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file
+              thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
+  @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /;
   $re1=join('|', @skipvars, @plugins);
   $re2=join('|', @plugins);
   $skip=0;
   open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
   while (<F>) {
     next if 1../The following groups are read/;
+    # formatting, skip line consisting entirely of dashes and blanks
+    next if /^[\- ]+$/;
+    next if /Value \(after reading options\)/; # skip table header
     next if /^($re1) /;
     next if /^($re2)-/;
     $skip=0 if /^  -/;
     $skip=1 if / --($re2)\b/;
-    # fixes for 32-bit
     y!\\!/!;
+    s/[ ]+/ /; # squeeze spaces to remove table formatting
+    # fixes for 32-bit
     s/\b4294967295\b/18446744073709551615/;
     s/\b2146435072\b/9223372036853727232/;
     s/\b196608\b/262144/;