diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
| commit | 37deed3f37561f264f65e162146bbc2ad35fb1a2 (patch) | |
| tree | c1cfb6c0995bfcc4ac3fb335f518a8b404413e32 /mysql-test/suite/galera/r/galera_many_columns.result | |
| parent | 658128af43b4d7c6db445164f8ed25ed4d1e3109 (diff) | |
| parent | 5b996782be6b752ce50a0ecaa222b0688aa9e75d (diff) | |
| download | mariadb-git-37deed3f37561f264f65e162146bbc2ad35fb1a2.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188
Diffstat (limited to 'mysql-test/suite/galera/r/galera_many_columns.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_many_columns.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/r/galera_many_columns.result b/mysql-test/suite/galera/r/galera_many_columns.result index db8a8f5ec9d..64e97f11fa7 100644 --- a/mysql-test/suite/galera/r/galera_many_columns.result +++ b/mysql-test/suite/galera/r/galera_many_columns.result @@ -1,3 +1,5 @@ +connection node_2; +connection node_1; INSERT INTO t1 (f1) VALUES (DEFAULT); connection node_2; SELECT f1 = 'ABC', f1017 = 'ABC' FROM t1; @@ -19,7 +21,7 @@ UPDATE t1 SET f2 = 'CDE' WHERE f1 = 'XYZ' AND f1017 = 'XYZ'; COMMIT; connection node_1; COMMIT; -ERROR 40001: Deadlock: wsrep aborted transaction +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction ROLLBACK; connection node_2; ROLLBACK; |