diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:29:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:29:11 +0300 |
| commit | 2f3968d98f8d90a9a9747e5b89c8f07efc6732e8 (patch) | |
| tree | a342bc6825a14ee122db2adebe93c26c3993cda6 | |
| parent | 05cc028f563acfe22d39296fb681a46539052211 (diff) | |
| download | mariadb-git-2f3968d98f8d90a9a9747e5b89c8f07efc6732e8.tar.gz | |
After-merge fixes for Galera test results
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/r/galera_many_columns.result b/mysql-test/suite/galera/r/galera_many_columns.result index 71e58f80537..527e1a0b519 100644 --- a/mysql-test/suite/galera/r/galera_many_columns.result +++ b/mysql-test/suite/galera/r/galera_many_columns.result @@ -19,7 +19,7 @@ UPDATE t1 SET f2 = 'CDE' WHERE f1 = 'XYZ' AND f1017 = 'XYZ'; COMMIT; connection node_1; COMMIT; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR 40001: wsrep aborted transaction ROLLBACK; connection node_2; ROLLBACK; diff --git a/mysql-test/suite/galera/r/galera_many_rows.result b/mysql-test/suite/galera/r/galera_many_rows.result index 6f9e76f010e..612ecc6a188 100644 --- a/mysql-test/suite/galera/r/galera_many_rows.result +++ b/mysql-test/suite/galera/r/galera_many_rows.result @@ -35,6 +35,6 @@ connection node_1; COMMIT; connection node_2; COMMIT; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR 40001: wsrep aborted transaction DROP TABLE t1; DROP TABLE ten; diff --git a/mysql-test/suite/galera/r/galera_many_tables_nopk.result b/mysql-test/suite/galera/r/galera_many_tables_nopk.result index 3e30b333250..b0983fe8289 100644 --- a/mysql-test/suite/galera/r/galera_many_tables_nopk.result +++ b/mysql-test/suite/galera/r/galera_many_tables_nopk.result @@ -18,6 +18,6 @@ connection node_1; COMMIT; connection node_2; COMMIT; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR 40001: wsrep aborted transaction DROP SCHEMA test; CREATE SCHEMA test; diff --git a/mysql-test/suite/galera/r/galera_many_tables_pk.result b/mysql-test/suite/galera/r/galera_many_tables_pk.result index ade0cb91344..31345a4b10e 100644 --- a/mysql-test/suite/galera/r/galera_many_tables_pk.result +++ b/mysql-test/suite/galera/r/galera_many_tables_pk.result @@ -23,7 +23,7 @@ connection node_1; COMMIT; connection node_2; COMMIT; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR 40001: wsrep aborted transaction include/diff_servers.inc [servers=1 2] DROP SCHEMA test; CREATE SCHEMA test; |