- latest mysql 5.7 also crashing on XA recovery, disable

XA recovery for all MySQL

Change-Id: I4f77de521cd80c09fdf97e5bbe5dfd1c830dc3cb
(cherry picked from commit 65d8deac95b63ea5702a9ce6b5d9a6c9a6a60991)

diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 5b84280b8d8d5945cf2558424261a7ec567487f7..d393fe57a55bda5b53b67411a39fc32d1961f29f 100644 (file)
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -407,6 +407,9 @@ class TransactionTest(fixtures.TestBase):
     # PG emergency shutdown:
     # select * from pg_prepared_xacts
     # ROLLBACK PREPARED '<xid>'
+    # MySQL emergency shutdown:
+    # for arg in `mysql -u root -e "xa recover" | cut -c 8-100 |
+    #     grep sa`; do mysql -u root -e "xa rollback '$arg'"; done
     @testing.crashes('mysql', 'Crashing on 5.5, not worth it')
     @testing.requires.skip_mysql_on_windows
     @testing.requires.two_phase_transactions

diff --git a/test/requirements.py b/test/requirements.py
index 1163a25ac6ddaf667af26f8ed8e92c0cf2fe6336..4281cd1d63f540990b28c92697860cbbfb264483 100644 (file)
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -400,11 +400,9 @@ class DefaultRequirements(SuiteRequirements):
     @property
     def two_phase_recovery(self):
         return self.two_phase_transactions + (
-            exclusions.fails_if(
-               lambda config:  config.db.name == 'mysql' and (
-                        'MariaDB' in config.db.dialect.server_version_info or
-                        config.db.dialect.server_version_info < (5, 7)
-               )
+            skip_if(
+               "mysql",
+               "crashes on most mariadb and mysql versions"
             )
         )