From 69bc2d529fd7014be248902f0fb746bdd3162126 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Tue, 16 Sep 2014 12:58:35 -0400
Subject: [PATCH] Updated mysqld--help test and result (MDEV-6717, MDEV-6659).

---
 mysql-test/r/mysqld--help.result | 3 +--
 mysql-test/t/mysqld--help.test   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 10cfc88eec2..e4db1fa2aba 100644
--- 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
index 2104159b3e9..96bbfccb568 100644
--- 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