database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 11.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@ -4593,6 +4593,7 @@ public:
is_slave_error= 0;
if (killed == KILL_BAD_DATA)
reset_killed();
my_errno= 0;
DBUG_VOID_RETURN;
}