diff options
| author | Monty <monty@mariadb.org> | 2018-01-30 15:04:08 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-30 15:04:08 +0200 |
| commit | 5478547c96a33adf7848d9e7f84bc6dcb9dead2f (patch) | |
| tree | f10556b886d543a182b578509a0b63c1e77d93e9 /mysql-test/suite/galera/r/galera_many_columns.result | |
| parent | 775aa5542d33384665aa788960e078cff526e492 (diff) | |
| download | mariadb-git-5478547c96a33adf7848d9e7f84bc6dcb9dead2f.tar.gz | |
Fixed failing tests
- Galera tests that was not updated with connection change
messages
- Test where out of memory error was changed (We are now using the
standard out of memory error in most places)
- Removed tokudb tests that uses include files that doesn't exist
in MariaDB
- Removed not supported mariadb startup option from option file
Diffstat (limited to 'mysql-test/suite/galera/r/galera_many_columns.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_many_columns.result | 2 |
1 files changed, 1 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 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; |