diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
| commit | 3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (patch) | |
| tree | cefa82212b688d12a7ca180f7a0a8f32715e2a79 /mysql-test/suite/galera/r/galera_toi_drop_database.result | |
| parent | 16327fc2e76e9215059894b461e8aca7f989da00 (diff) | |
| parent | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (diff) | |
| download | mariadb-git-3f9040085a0de4976f55bc7e4a2fa5fa8d923100.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev17096
Diffstat (limited to 'mysql-test/suite/galera/r/galera_toi_drop_database.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_toi_drop_database.result | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/r/galera_toi_drop_database.result b/mysql-test/suite/galera/r/galera_toi_drop_database.result index 6d88c8ea230..48056c70126 100644 --- a/mysql-test/suite/galera/r/galera_toi_drop_database.result +++ b/mysql-test/suite/galera/r/galera_toi_drop_database.result @@ -1,3 +1,5 @@ +connection node_2; +connection node_1; connection node_1; CREATE DATABASE database1; USE database1; @@ -14,9 +16,9 @@ INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, te connection node_2; DROP DATABASE database1;; connection node_1; -ERROR 40001: Deadlock: wsrep aborted transaction +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction connection node_1a; -ERROR 40001: Deadlock: wsrep aborted transaction +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction connection node_2; connection node_1; SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'database1'; |