Updated mysqld--help test and result (MDEV-6717, MDEV-6659).

MariaDB · Sep 16, 2014 · 69bc2d5 · 69bc2d5
1 parent ac2a2f3
commit 69bc2d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
@@ -1447,7 +1447,6 @@ wsrep-certify-nonPK TRUE
 wsrep-cluster-address 
 wsrep-cluster-name my_wsrep_cluster
 wsrep-convert-LOCK-to-trx FALSE
-wsrep-data-home-dir 
 wsrep-dbug-option 
 wsrep-debug FALSE
 wsrep-desync FALSE
@@ -1462,7 +1461,7 @@ wsrep-new-cluster FALSE
 wsrep-node-address 
 wsrep-node-incoming-address AUTO
 wsrep-notify-cmd 
-wsrep-on FALSE
+wsrep-on TRUE
 wsrep-provider none
 wsrep-provider-options 
 wsrep-recover FALSE

diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
@@ -22,7 +22,7 @@ perl;
                log-slow-queries pid-file slow-query-log-file log-basename
                datadir slave-load-tmpdir tmpdir socket thread-pool-size
                large-files-support lower-case-file-system system-time-zone
-               wsrep-node-name version.*/;
+               wsrep-node-name wsrep-data-home-dir version.*/;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster