diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
| commit | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (patch) | |
| tree | 42c96cf95d5df2950b77329c76c0024f33088aff /mysql-test/suite/wsrep/r/variables.result | |
| parent | e6f95b23f425001a14a528256354e0faf4e272f6 (diff) | |
| parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
| download | mariadb-git-09a1f0075a8d5752dd7b2940a20d86a040af1741.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/wsrep/r/variables.result')
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 1ff221f1459..a9988fd1628 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("WSREP: Initial position was provided by configuration or SST, avoiding override"); SET @wsrep_provider_options_saved= @@global.wsrep_provider_options; SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address; @@ -48,6 +49,8 @@ wsrep_flow_control_paused_ns # wsrep_flow_control_paused # wsrep_flow_control_sent # wsrep_flow_control_recv # +wsrep_flow_control_active # +wsrep_flow_control_requested # wsrep_cert_deps_distance # wsrep_apply_oooe # wsrep_apply_oool # @@ -109,6 +112,8 @@ wsrep_flow_control_paused_ns # wsrep_flow_control_paused # wsrep_flow_control_sent # wsrep_flow_control_recv # +wsrep_flow_control_active # +wsrep_flow_control_requested # wsrep_cert_deps_distance # wsrep_apply_oooe # wsrep_apply_oool # |