diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
| commit | c59c1a0736e36e9c66f798d199a124f362353377 (patch) | |
| tree | 80ee18faad049687b0b4f0e2f147caf870d68390 /mysql-test/suite/galera/r/galera_serializable.result | |
| parent | 26971c9aea67a62f348cd105348a8dc4407bcf4a (diff) | |
| parent | 0b597d3ab2494bc1db97cc4a30d697a5fdf48c21 (diff) | |
| download | mariadb-git-c59c1a0736e36e9c66f798d199a124f362353377.tar.gz | |
System Versioning 1.0 pre8
Merge branch '10.3' into trunk
Diffstat (limited to 'mysql-test/suite/galera/r/galera_serializable.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_serializable.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/galera/r/galera_serializable.result b/mysql-test/suite/galera/r/galera_serializable.result index f82adbbd1db..be3f93a081f 100644 --- a/mysql-test/suite/galera/r/galera_serializable.result +++ b/mysql-test/suite/galera/r/galera_serializable.result @@ -9,7 +9,7 @@ connection node_2; INSERT INTO t1 VALUES (1,1); connection node_1; SELECT * FROM t1; -ERROR 40001: wsrep aborted transaction +ERROR 40001: Deadlock: wsrep aborted transaction ROLLBACK; DELETE FROM t1; connection node_1; @@ -22,7 +22,7 @@ connection node_2; UPDATE t1 SET f2 = 2; connection node_1; UPDATE t1 SET f2 = 3; -ERROR 40001: wsrep aborted transaction +ERROR 40001: Deadlock: wsrep aborted transaction ROLLBACK; DELETE FROM t1; connection node_1; @@ -33,5 +33,5 @@ connection node_2; INSERT INTO t1 VALUES (1,2); connection node_1; COMMIT; -ERROR 40001: wsrep aborted transaction +ERROR 40001: Deadlock: wsrep aborted transaction DROP TABLE t1; |