diff options
| author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-29 16:59:36 +0530 |
|---|---|---|
| committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-29 16:59:36 +0530 |
| commit | 25ede13611b3c1f736be22fc581a0c371d212f61 (patch) | |
| tree | 0a930e742c1f80786b573067bfed9014c8c54ce8 /mysql-test/suite/wsrep | |
| parent | 080522dcd7177a0008824802cd58a36ee8048d8f (diff) | |
| parent | 79e32e47a11150839ac4ab44ac02d4019c0e0019 (diff) | |
| download | mariadb-git-25ede13611b3c1f736be22fc581a0c371d212f61.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'mysql-test/suite/wsrep')
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 1ff221f1459..87a385ec9a6 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -48,6 +48,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 # @@ -63,6 +65,7 @@ wsrep_cert_interval # wsrep_open_transactions # wsrep_open_connections # wsrep_incoming_addresses # +wsrep_debug_sync_waiters # wsrep_applier_thread_count # wsrep_cluster_capabilities # wsrep_cluster_conf_id # @@ -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 # @@ -124,6 +129,7 @@ wsrep_cert_interval # wsrep_open_transactions # wsrep_open_connections # wsrep_incoming_addresses # +wsrep_debug_sync_waiters # wsrep_applier_thread_count # wsrep_cluster_capabilities # wsrep_cluster_conf_id # diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 89b1ff99012..93aa31b9c93 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -1,6 +1,7 @@ --source include/have_wsrep.inc --source include/force_restart.inc --source include/have_innodb.inc +--source include/galera_have_debug_sync.inc SET @wsrep_provider_options_saved= @@global.wsrep_provider_options; SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address; |