MDEV-508 (Wrong MTR result files in MariaDB-Galera)

mysql-test/r/mysqld--help.result

@@ -1186,7 +1186,6 @@ wsrep-max-ws-size 1073741824
 wsrep-mysql-replication-bundle 0
 wsrep-node-address 
 wsrep-node-incoming-address AUTO
-wsrep-node-name meddwl
 wsrep-notify-cmd 
 wsrep-on FALSE
 wsrep-provider none

mysql-test/suite/percona/innodb_sys_index.result

@@ -3,7 +3,7 @@ Warnings:
 Note	1051	Unknown table 't1'
 select @@version_comment limit 1 ;
 @@version_comment
-Source distribution
+Source distribution, wsrep_X.Y.rZ
 SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ;
 CREATE TABLE test.t1 (  `a` SERIAL NOT NULL ,  `b` VARCHAR( 255 ) NOT NULL ,  INDEX ( `b` )  ) ENGINE = InnoDB ;
 SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ;

mysql-test/suite/percona/innodb_sys_index.test

@@ -5,6 +5,7 @@ drop table if exists t1;
 #
 # test for bug LP#875797 "Using 'innodb_sys_indexes' causes core dump"
 #
+--replace_regex /wsrep_[0-9]+\.[a-zA-Z0-9]+\.r[0-9]+/wsrep_X.Y.rZ/
 select @@version_comment limit 1 ;
 --disable_result_log
 SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ;
@@ -19,3 +20,4 @@ SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ;
 drop table test.t1;
 SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ;
 --enable_result_log
+

mysql-test/t/mysqld--help.test

@@ -20,7 +20,7 @@ perl;
   # their paths may vary:
   @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
                log-slow-queries pid-file slow-query-log-file log-basename
-               datadir slave-load-tmpdir tmpdir socket/;
+               datadir slave-load-tmpdir tmpdir socket wsrep-node-name/;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster feedback debug temp-pool ssl des-key-file