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

Merge branch '10.11 into 11.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-30 11:59:53 +01:00
parent 5be38d14fc e69f8cae1a
commit 7d657fda64
344 changed files with 9076 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/rpl_parallel.cc
View File

@@ -1072,14 +1072,15 @@ do_retry:
/* The loop is here so we can try again the next relay log file on EOF. */
for (;;)
{
int error;
old_offset= cur_offset;
ev= Log_event::read_log_event(&rlog, description_event,
ev= Log_event::read_log_event(&rlog, &error, description_event,
opt_slave_sql_verify_checksum);
cur_offset= my_b_tell(&rlog);
if (ev)
break;
if (unlikely(rlog.error < 0))
if (unlikely(error))
{
errmsg= "slave SQL thread aborted because of I/O error";
err= 1;