diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-19 15:47:01 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-19 15:47:01 -0500 |
| commit | da4babb86cebef74e86b330922288eb10272b47e (patch) | |
| tree | f56f5b771097f9618d277e6f3bbc93cf7080d009 /plugin | |
| parent | a01bfc9fc251d02e2a6152276eb805e07d213210 (diff) | |
| download | mariadb-git-da4babb86cebef74e86b330922288eb10272b47e.tar.gz | |
Fix failing galera tests.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result | 4 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result b/plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result index 12baf6c941b..f33a628d428 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result +++ b/plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result @@ -2,7 +2,7 @@ connection node_1; SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS; NODE_INDEX NODE_STATUS CLUSTER_STATUS CLUSTER_SIZE CLUSTER_STATE_UUID CLUSTER_STATE_SEQNO CLUSTER_CONF_ID GAP PROTOCOL_VERSION -<IDX> Synced Primary 2 <CLUSTER_STATE_UUID> 0 2 NO 3 +<IDX> Synced Primary 2 <CLUSTER_STATE_UUID> 0 <CLUSTER_CONF_ID> NO 3 SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME; INDEX UUID NAME ADDRESS <IDX> <MEMBER_ID> test-node-1 <ADDRESS> @@ -11,7 +11,7 @@ INDEX UUID NAME ADDRESS connection node_2; SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS; NODE_INDEX NODE_STATUS CLUSTER_STATUS CLUSTER_SIZE CLUSTER_STATE_UUID CLUSTER_STATE_SEQNO CLUSTER_CONF_ID GAP PROTOCOL_VERSION -<IDX> Synced Primary 2 <CLUSTER_STATE_UUID> 0 2 YES 3 +<IDX> Synced Primary 2 <CLUSTER_STATE_UUID> 0 <CLUSTER_CONF_ID> YES 3 SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME; INDEX UUID NAME ADDRESS <IDX> <MEMBER_ID> test-node-1 <ADDRESS> diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test b/plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test index 9b06f15b125..9ae783a957e 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test +++ b/plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test @@ -4,7 +4,7 @@ --echo # On node 1 --connection node_1 ---replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> +--replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> 7 <CLUSTER_CONF_ID> SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS; --replace_column 1 <IDX> 2 <MEMBER_ID> 4 <ADDRESS> @@ -13,7 +13,7 @@ SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME; --echo # On node 2 --connection node_2 ---replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> +--replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> 7 <CLUSTER_CONF_ID> SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS; --replace_column 1 <IDX> 2 <MEMBER_ID> 4 <ADDRESS> |