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.4 into 11.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 16:09:56 +03:00
parent ba7088d462 b53b81e937
commit 43465352b9
561 changed files with 5812 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

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