=== modified file 'mysql-test/r/mysqld--help.result' --- mysql-test/r/mysqld--help.result 2012-12-20 11:34:37 +0000 +++ mysql-test/r/mysqld--help.result 2013-01-29 12:36:31 +0000 @@ -1186,7 +1186,6 @@ 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 === modified file 'mysql-test/suite/percona/innodb_sys_index.result' --- mysql-test/suite/percona/innodb_sys_index.result 2011-11-24 17:07:36 +0000 +++ mysql-test/suite/percona/innodb_sys_index.result 2013-01-29 12:51:23 +0000 @@ -3,7 +3,7 @@ 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%' ; === modified file 'mysql-test/suite/percona/innodb_sys_index.test' --- mysql-test/suite/percona/innodb_sys_index.test 2012-02-23 06:50:11 +0000 +++ mysql-test/suite/percona/innodb_sys_index.test 2013-01-29 12:57:01 +0000 @@ -5,6 +5,7 @@ # # 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 @@ drop table test.t1; SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; --enable_result_log + === modified file 'mysql-test/t/mysqld--help.test' --- mysql-test/t/mysqld--help.test 2012-12-20 11:34:37 +0000 +++ mysql-test/t/mysqld--help.test 2013-01-29 12:35:54 +0000 @@ -20,7 +20,7 @@ # 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