diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
| commit | 73985d83014e2a484dffac135193a2f0cf715b54 (patch) | |
| tree | 7167799ebc178519babd7000c76234665a9d6030 /mysql-test/include | |
| parent | 496532b5c54d69e012f6fc2417e97d61465588f2 (diff) | |
| parent | aade6e53d398dd287ca7e771191c9975099b4fa1 (diff) | |
| download | mariadb-git-73985d83014e2a484dffac135193a2f0cf715b54.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/binlog_parallel_replication_marks.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/binlog_parallel_replication_marks.test b/mysql-test/include/binlog_parallel_replication_marks.test index 82fa997822d..3976088ca43 100644 --- a/mysql-test/include/binlog_parallel_replication_marks.test +++ b/mysql-test/include/binlog_parallel_replication_marks.test @@ -80,7 +80,7 @@ while (<F>) { s/table id \d+/table id #/; s/mapped to number \d+/mapped to number #/; s/CRC32 0x[0-9a-f]+/CRC32 0x########/; - print if /GTID|BEGIN|COMMIT|Table_map|Write_rows|Update_rows|Delete_rows|generated by server|40005 TEMPORARY/; + print if /\b(GTID|BEGIN|COMMIT|Table_map|Write_rows|Update_rows|Delete_rows|generated by server|40005 TEMPORARY)\b/; } close F; EOF |