Skip to content

Commit 916e673

Browse files
blauddennawazn
authored andcommitted
Bug#34986611 Test Ndb MTA unordered commits with log
The LAST_ERROR_MESSAGE returned from performance_schema.replication_applier_status_by_worker when applier has stopped varies across platforms. The error message contains what seems to be platform specific messages from Windows and Mac. Fix by not showing the LAST_ERROR_MESSAGE column. Change-Id: I1b31ad0910ec8d9c13bd4cc48ba64027eb19b5d4
1 parent 0b388ef commit 916e673

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

mysql-test/suite/ndb_rpl/r/mta_commit_sync2.result

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,14 @@ commit;
109109
[connection slave]
110110
# Wait for replication error
111111
include/wait_for_slave_sql_error.inc [errno=3030]
112-
# Show the error number and message after failure
113-
SELECT WORKER_ID, LAST_ERROR_NUMBER, LAST_ERROR_MESSAGE
112+
# Show the error number after failure
113+
SELECT WORKER_ID, LAST_ERROR_NUMBER
114114
FROM performance_schema.replication_applier_status_by_worker
115115
WHERE LAST_ERROR_NUMBER != 0;
116116
WORKER_ID 1
117117
LAST_ERROR_NUMBER 1180
118-
LAST_ERROR_MESSAGE Worker 1 failed executing transaction 'ANONYMOUS' at source log master-bin.000001, end_log_pos NNN; Could not execute Write_rows event on table test.t1; Got error -1 - 'Unknown error -1' during COMMIT, Error_code: 1180; the event's source log master-bin.000001, end_log_pos NNN
119118
WORKER_ID 2
120119
LAST_ERROR_NUMBER 3030
121-
LAST_ERROR_MESSAGE Worker 2 failed executing transaction 'ANONYMOUS' at source log master-bin.000001, end_log_pos NNN; Error 'Replica worker has stopped after at least one previous worker encountered an error when replica-preserve-commit-order was enabled. To preserve commit order, the last transaction executed by this thread has not been committed. When restarting the replica after fixing any failed threads, you should fix this worker as well.' on query. Default database: ''. Query: 'COMMIT'
122120
# Show the coordinator error number and message
123121
SELECT LAST_ERROR_NUMBER, LAST_ERROR_MESSAGE
124122
FROM performance_schema.replication_applier_status_by_coordinator;

mysql-test/suite/ndb_rpl/t/mta_commit_sync2.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,9 @@ commit;
126126
let $slave_sql_errno= 3030;
127127
--source include/wait_for_slave_sql_error.inc
128128

129-
--echo # Show the error number and message after failure
130-
--replace_regex /end_log_pos [0-9]*/end_log_pos NNN/
129+
--echo # Show the error number after failure
131130
query_vertical
132-
SELECT WORKER_ID, LAST_ERROR_NUMBER, LAST_ERROR_MESSAGE
131+
SELECT WORKER_ID, LAST_ERROR_NUMBER
133132
FROM performance_schema.replication_applier_status_by_worker
134133
WHERE LAST_ERROR_NUMBER != 0;
135134
--echo # Show the coordinator error number and message

0 commit comments

Comments
 (0)