Merge 10.5 into 10.6

MariaDB · Apr 25, 2023 · 818d5e4 · 818d5e4
2 parents 0976afe + 50f3b7d
commit 818d5e4
Show file tree

Hide file tree

Showing 83 changed files with 2,326 additions and 624 deletions.
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -5212,6 +5212,7 @@ void do_shutdown_server(struct st_command *command)
     if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout))
     {
       (void) my_kill(pid, SIGKILL);
+      wait_until_dead(pid, 5);
     }
   }
   DBUG_VOID_RETURN;

diff --git a/debian/control b/debian/control
@@ -766,6 +766,7 @@ Depends: libxml2,
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: curl
 Breaks: mariadb-connect-engine-10.0,
         mariadb-connect-engine-10.1,
         mariadb-connect-engine-10.2,