After-merge fixes for Galera test results

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;

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;

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;

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;