diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
| commit | de2d08994255739d53ba28ea34288ca8352029b1 (patch) | |
| tree | cc557fe9fa3655a03cae9b6895c6e8a0348b2f86 /mysql-test/suite/galera/r/galera_UK_conflict.result | |
| parent | 4d9fe4032b768e04e33482d83199882c7bb0d9d8 (diff) | |
| parent | 638625278e7cadf42633e6f9d1b663ca1e3e1bb1 (diff) | |
| download | mariadb-git-de2d08994255739d53ba28ea34288ca8352029b1.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'mysql-test/suite/galera/r/galera_UK_conflict.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_UK_conflict.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/r/galera_UK_conflict.result b/mysql-test/suite/galera/r/galera_UK_conflict.result index 402289d7ef8..b0420d58ede 100644 --- a/mysql-test/suite/galera/r/galera_UK_conflict.result +++ b/mysql-test/suite/galera/r/galera_UK_conflict.result @@ -144,7 +144,6 @@ SET debug_sync='RESET'; connection node_1; SET GLOBAL wsrep_slave_threads = DEFAULT; connection node_2; -SET SESSION wsrep_sync_wait=15; SELECT * FROM t1; f1 f2 f3 1 1 0 |