diff options
Diffstat (limited to 'mysql-test/suite/perfschema/t/transaction.test')
| -rw-r--r-- | mysql-test/suite/perfschema/t/transaction.test | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/suite/perfschema/t/transaction.test b/mysql-test/suite/perfschema/t/transaction.test index 052748f1f07..99ddc1eca46 100644 --- a/mysql-test/suite/perfschema/t/transaction.test +++ b/mysql-test/suite/perfschema/t/transaction.test @@ -14,6 +14,7 @@ --disable_query_log --source ../include/transaction_setup.inc --enable_query_log +set global binlog_format=ROW; --echo --echo ======================================================================== @@ -302,6 +303,7 @@ XA START 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890; --echo --echo ## Expect 1 active XA transaction, state ACTIVE --connection default + CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'ACTIVE', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1); --echo @@ -407,6 +409,8 @@ CALL clear_transaction_tables(); --echo # STEP 8 - TRANSACTIONAL AND NON-TRANSACTIONAL TABLES --echo ======================================================================== --echo +--echo ## MariaDB bug: MDEV-6012? MDEV-14436? +set @mariadb_bug=1; ## Statements that work with non-transactional engines have no effect on the ## transaction state of the connection. For implicit transactions, @@ -427,7 +431,7 @@ INSERT INTO nt1 VALUES (801, 'NON-TRANSACTIONAL'); --echo --echo ## Expect 0 transactions in events_transactions_current --connection default -CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0); +CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug); --connection con1 COMMIT; @@ -435,7 +439,7 @@ COMMIT; --echo --echo ## Expect 0 transactions in events_transactions_history --connection default -CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0); +CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug); --echo --echo # @@ -450,7 +454,7 @@ INSERT INTO nt1 VALUES (802, 'NON-TRANSACTIONAL'); --echo --echo ## Expect 0 transactions in events_transactions_current --connection default -CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0); +CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug); --echo --echo ## Now transactional. Transaction should be started. @@ -471,7 +475,7 @@ COMMIT; --echo ## Expect 1 committed transaction in events_transactions_current and history --connection default CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1); -CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1); +CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1+@mariadb_bug); CALL clear_transaction_tables(); --echo @@ -727,3 +731,4 @@ DROP TABLE t1; DROP TABLE nt1; --source ../include/transaction_cleanup.inc +set global binlog_format=default; |