From 85c88fe6f1d622d10f5ac2d747412cb90f5cf150 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:13 +0200 Subject: Merging debian version 1:11.4.2-1. Signed-off-by: Daniel Baumann debian/control debian/libmariadbd19.install debian/libmariadbd19.lintian-overrides debian/salsa-ci.yml --- debian/patches/startup-message.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/patches/startup-message.patch') diff --git a/debian/patches/startup-message.patch b/debian/patches/startup-message.patch index 6b8bbce7..5c4994a4 100644 --- a/debian/patches/startup-message.patch +++ b/debian/patches/startup-message.patch @@ -27,7 +27,7 @@ Server output if build in git directory: --- a/client/mysql.cc +++ b/client/mysql.cc -@@ -1328,6 +1328,9 @@ int main(int argc,char *argv[]) +@@ -1333,6 +1333,9 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql), server_version_string(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO); @@ -39,7 +39,7 @@ Server output if build in git directory: #ifdef HAVE_READLINE --- a/sql/mysqld.cc +++ b/sql/mysqld.cc -@@ -4985,12 +4985,21 @@ static int init_server_components() +@@ -4932,12 +4932,21 @@ static int init_server_components() my_sleep_for_space= mariadb_sleep_for_space; /* -- cgit v1.2.3