diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 23:19:51 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 23:19:51 +0200 |
| commit | ae6bdc6769646a09a8d4d08a42a69174ea677768 (patch) | |
| tree | c80afdd0e3238dc5092fdcb1439f1390f9a9040b /mysql-test/suite/wsrep | |
| parent | a49f5525bbe1bb1f4320bd0db066068a81af62d9 (diff) | |
| parent | 7841a7eb09208f52fcbab7e80e38c7ca29b1339e (diff) | |
| download | mariadb-git-ae6bdc6769646a09a8d4d08a42a69174ea677768.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 | 1 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables_debug.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables_debug.test | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 5fe8dcb1c6d..c21e4dc0323 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -34,6 +34,7 @@ wsrep_cert_deps_distance # wsrep_apply_oooe # wsrep_apply_oool # wsrep_apply_window # +wsrep_apply_waits # wsrep_commit_oooe # wsrep_commit_oool # wsrep_commit_window # diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result index 0bb41ebb1f8..65f5b0ee274 100644 --- a/mysql-test/suite/wsrep/r/variables_debug.result +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -34,6 +34,7 @@ wsrep_cert_deps_distance # wsrep_apply_oooe # wsrep_apply_oool # wsrep_apply_window # +wsrep_apply_waits # wsrep_commit_oooe # wsrep_commit_oool # wsrep_commit_window # diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 249fba48d44..e40ac7b8772 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -3,7 +3,7 @@ --source include/have_innodb.inc --source include/galera_no_debug_sync.inc ---let $galera_version=26.4.8 +--let $galera_version=26.4.9 source include/check_galera_version.inc; source include/galera_variables_ok.inc; diff --git a/mysql-test/suite/wsrep/t/variables_debug.test b/mysql-test/suite/wsrep/t/variables_debug.test index c48c2d895b9..29747e48f18 100644 --- a/mysql-test/suite/wsrep/t/variables_debug.test +++ b/mysql-test/suite/wsrep/t/variables_debug.test @@ -5,7 +5,7 @@ --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc ---let $galera_version=26.4.8 +--let $galera_version=26.4.9 source include/check_galera_version.inc; source include/galera_variables_ok.inc; |