Merge 10.6 into 10.8

MariaDB · Apr 26, 2023 · c15c8ef · c15c8ef
2 parents 3c25077 + 5740638
commit c15c8ef
Show file tree

Hide file tree

Showing 94 changed files with 2,402 additions and 655 deletions.
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -5262,6 +5262,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
@@ -815,6 +815,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,