diff options
Diffstat (limited to 'mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test b/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test index 39d18b7403d..056b449b8fb 100644 --- a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test +++ b/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test @@ -219,13 +219,12 @@ while (`SELECT $ddl_cases >= 1`) # in the binary log: # # 1: DDL EVENT which triggered the previous commmit. - # 2: COMMIT - # 3: BEGIN - # 4: TABLE MAP EVENT - # 5: TABLE MAP EVENT (ndb_apply_status) + # 2: BEGIN + # 3: TABLE MAP EVENT + # 4: TABLE MAP EVENT (ndb_apply_status) + # 5: ROW EVENT # 6: ROW EVENT - # 7: ROW EVENT - # 8: COMMIT + # 7: COMMIT # if (`SELECT '$engine' = 'NDB' && @@binlog_format != 'ROW'`) { @@ -362,8 +361,11 @@ while (`SELECT $ddl_cases >= 1`) # does not commit the current transaction. # # 1: BEGIN - # 2: INSERT - # 3: CREATE TEMPORARY + # 2: CREATE TEMPORARY + # 3: COMMIT + # 4: BEGIN + # 5: INSERT + # 6: COMMIT # # In RBR the transaction is not committed either and the statement is not # written to the binary log: @@ -371,10 +373,11 @@ while (`SELECT $ddl_cases >= 1`) # 1: BEGIN # 2: TABLE MAP EVENT # 3: ROW EVENT + # 4: COMMIT # - if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) + if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'` ) { - let $commit_event_row_number= 4; + let $commit_event_row_number= 6; } # # In NDB (RBR mode), the commit event is the sixth event @@ -482,9 +485,14 @@ while (`SELECT $ddl_cases >= 1`) # In SBR and MIXED modes, the DDL statement is written to the binary log # but does not commit the current transaction: # + # In SBR, we have what follows: + # # 1: BEGIN - # 2: INSERT - # 3: DROP TEMPORARY + # 2: DROP TEMPORARY + # 3: COMMIT + # 4: BEGIN + # 5: INSERT + # 6: COMMIT # # In RBR the transaction is not committed either and the statement is not # written to the binary log: @@ -492,9 +500,14 @@ while (`SELECT $ddl_cases >= 1`) # 1: BEGIN # 2: TABLE MAP EVENT # 3: ROW EVENT + # 4: COMMIT # if (`select @@binlog_format = 'STATEMENT'`) { + let $commit_event_row_number= 6; + } + if (`select @@binlog_format = 'ROW'`) + { let $commit_event_row_number= 4; } # In MIXED mode, the changes are logged as rows and we have what follows: @@ -503,6 +516,7 @@ while (`SELECT $ddl_cases >= 1`) # 2: TABLE MAP EVENT # 3: ROW EVENT # 4: DROP TEMPORARY table IF EXISTS + # 5: COMMIT # if (`select @@binlog_format = 'MIXED'`) { |