database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fix incorrect merge 15700f54c2

Browse Source 
error messages in 11.8 should have same numbers as in 11.4
This commit is contained in:
Sergei Golubchik
2025-04-17 16:29:07 +02:00
parent 76b54a2a67
commit 805e7ca3ad
19 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_xa.result
View File

@@ -30,7 +30,7 @@ insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc

2
mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result
View File

@@ -36,7 +36,7 @@ insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc