Test cleanup in rpl_binlog_grant: XID values are unpredictable

mysql-test/suite/rpl/r/rpl_binlog_grant.result

@@ -19,7 +19,7 @@ master-bin.000001	193	Query	1	272	create database d1
 master-bin.000001	272	Query	1	370	use `d1`; create table t (s1 int) engine=innodb
 master-bin.000001	370	Query	1	436	use `d1`; BEGIN
 master-bin.000001	436	Query	1	521	use `d1`; insert into t values (1)
-master-bin.000001	521	Xid	1	548	COMMIT /* xid=12 */
+master-bin.000001	521	Xid	1	548	COMMIT /* XID */
 master-bin.000001	548	Query	1	633	use `d1`; grant select on t to x@y
 start transaction;
 insert into t values (2);
@@ -40,11 +40,11 @@ master-bin.000001	193	Query	1	272	create database d1
 master-bin.000001	272	Query	1	370	use `d1`; create table t (s1 int) engine=innodb
 master-bin.000001	370	Query	1	436	use `d1`; BEGIN
 master-bin.000001	436	Query	1	521	use `d1`; insert into t values (1)
-master-bin.000001	521	Xid	1	548	COMMIT /* xid=12 */
+master-bin.000001	521	Xid	1	548	COMMIT /* XID */
 master-bin.000001	548	Query	1	633	use `d1`; grant select on t to x@y
 master-bin.000001	633	Query	1	699	use `d1`; BEGIN
 master-bin.000001	699	Query	1	784	use `d1`; insert into t values (2)
-master-bin.000001	784	Xid	1	811	COMMIT /* xid=18 */
+master-bin.000001	784	Xid	1	811	COMMIT /* XID */
 master-bin.000001	811	Query	1	899	use `d1`; revoke select on t from x@y
 drop user x@y;
 drop database d1;

mysql-test/suite/rpl/t/rpl_binlog_grant.test

@@ -25,6 +25,7 @@ grant select on t to x@y;
 rollback;
 show grants for x@y;
 --replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
 show binlog events;
 start transaction;
 insert into t values (2);
@@ -36,6 +37,7 @@ commit;
 select * from t;
 show grants for x@y;
 --replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
 show binlog events;
 drop user x@y;
 drop database d1;