0004806: Fixed transaction file generation for MySQL 5.5 and earlier (#…

…139)
JumpMind · Feb 2, 2021 · de90994 · de90994
1 parent 65af1a7
commit de90994
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDatabasePlatform.java
@@ -187,6 +187,27 @@ public List<Transaction> getTransactions() {
             transactionString = "engine_transaction";
             lockWaitsString = "performance_schema.data_lock_waits";
         }
+        List<Transaction> transactions = new ArrayList<Transaction>();
+        if (template.getDatabaseMajorVersion() == 5 && template.getDatabaseMinorVersion() <= 5) {
+            String sql = "SELECT" + 
+                    "  b.trx_id," + 
+                    "  b.trx_started," + 
+                    "  b.trx_state," + 
+                    "  b.trx_rows_modified," + 
+                    "  w.blocking_" + transactionString + "_id 'blockingId'," + 
+                    "  b.trx_query " + 
+                    "FROM " + lockWaitsString + " w " + 
+                    "RIGHT JOIN information_schema.innodb_trx b" + 
+                    "  ON b.trx_id = w.requesting_" + transactionString + "_id;";
+            for (Row row : template.query(sql)) {
+                Transaction transaction = new Transaction(row.getString("trx_id"), "",
+                        row.getString("blockingId"), row.getDateTime("trx_started"), row.getString("trx_query"));
+                transaction.setStatus(row.getString("trx_state"));
+                transaction.setWrites(row.getInt("trx_rows_modified"));
+                transactions.add(transaction);
+            }
+            return transactions;
+        }
         String sql = "SELECT" + 
                 "  b.trx_id," + 
                 "  t.processlist_user," + 
@@ -201,7 +222,6 @@ public List<Transaction> getTransactions() {
                 "  ON b.trx_id = w.requesting_" + transactionString + "_id " + 
                 "INNER JOIN performance_schema.threads t" + 
                 "  ON b.trx_mysql_thread_id = t.thread_id;";
-        List<Transaction> transactions = new ArrayList<Transaction>();
         for (Row row : template.query(sql)) {
             Transaction transaction = new Transaction(row.getString("trx_id"), row.getString("processlist_user"),
                     row.getString("blockingId"), row.getDateTime("trx_started"), row.getString("trx_query"));