diff options
| author | Monty <monty@mariadb.org> | 2018-02-07 19:16:45 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-02-10 10:38:02 +0200 |
| commit | a801ba5ce6bda1c2dee41724307bf59f244dda14 (patch) | |
| tree | e768a82e6fb7b322a74bcfe35bae148f018048a4 | |
| parent | 5559905d4186ce62c9df49d41d0f05c1189fd753 (diff) | |
| download | mariadb-git-a801ba5ce6bda1c2dee41724307bf59f244dda14.tar.gz | |
Updated galera .result files
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 527e1a0b519..db8a8f5ec9d 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: wsrep aborted transaction +ERROR 40001: Deadlock: 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 612ecc6a188..b06925fea60 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: wsrep aborted transaction +ERROR 40001: Deadlock: 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 b0983fe8289..573ce758a13 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: wsrep aborted transaction +ERROR 40001: Deadlock: 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 31345a4b10e..67624d5edb0 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: wsrep aborted transaction +ERROR 40001: Deadlock: wsrep aborted transaction include/diff_servers.inc [servers=1 2] DROP SCHEMA test; CREATE SCHEMA test; |