diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-11-01 13:07:55 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-11-02 10:25:52 +0200 |
| commit | 7846c56fbec72941abd8bada25ac63fc4eb94552 (patch) | |
| tree | 87d678d95ee981e9e1587d2eac2c02dbbb40e395 /mysql-test/suite/galera/r/galera_ssl_upgrade.result | |
| parent | cb5b3230d84c24d373e761ada6cb38055015d5ca (diff) | |
| download | mariadb-git-7846c56fbec72941abd8bada25ac63fc4eb94552.tar.gz | |
MDEV-23328 Server hang due to Galera lock conflict resolution
* Fix error handling NULL-pointer reference
* Add mtr-suppression on galera_ssl_upgrade
Diffstat (limited to 'mysql-test/suite/galera/r/galera_ssl_upgrade.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_ssl_upgrade.result | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/r/galera_ssl_upgrade.result b/mysql-test/suite/galera/r/galera_ssl_upgrade.result index 134d1d1b605..9993b86e0e9 100644 --- a/mysql-test/suite/galera/r/galera_ssl_upgrade.result +++ b/mysql-test/suite/galera/r/galera_ssl_upgrade.result @@ -1,9 +1,9 @@ connection node_2; connection node_1; connection node_1; -call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown.*"); +call mtr.add_suppression("WSREP: write_handler().*"); connection node_2; -call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown.*"); +call mtr.add_suppression("WSREP: write_handler():.*"); connection node_1; connection node_2; connection node_1; @@ -27,5 +27,7 @@ SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N VARIABLE_VALUE = 2 1 connection node_2; -disconnect node_2; -disconnect node_1; +connection node_1; +call mtr.add_suppression("WSREP: write_handler().*"); +connection node_2; +call mtr.add_suppression("WSREP: write_handler():.*"); |