From b453123a26bd88b269fe894def49dfae79b537f5 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Thu, 20 Feb 2025 13:12:23 +0100
Subject: [PATCH] MDEV-36130: main.mysqldump fails in parallel mysql-import
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Skip printing the error if it is expected — that is, when mariadb-import
is aborting.

In a multithreading scenario, another thread may encounter an error
because the corresponding connection was killed. Do not print this error.
---
 client/mysqlimport.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/mysqlimport.cc b/client/mysqlimport.cc
index 4f78aad2518..ab1bf798d41 100644
--- a/client/mysqlimport.cc
+++ b/client/mysqlimport.cc
@@ -984,6 +984,8 @@ static void fatal_error(const char *format, ...)
 
 static void db_error(MYSQL *mysql)
 {
+  if (aborting)
+    return;
   const char *info= mysql_info(mysql);
   auto err= mysql_errno(mysql);
   auto err_text = mysql_error(mysql);