diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
| commit | 85c88fe6f1d622d10f5ac2d747412cb90f5cf150 (patch) | |
| tree | 310fa21dd40d6c7ad918d0771b5f03c378d54cc6 /debian/patches/startup-message.patch | |
| parent | Merging upstream version 1:11.4.2. (diff) | |
| download | mariadb-progress-linux.tar.xz mariadb-progress-linux.zip | |
Merging debian version 1:11.4.2-1.HEADprogress-linux
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
debian/control
debian/libmariadbd19.install
debian/libmariadbd19.lintian-overrides
debian/salsa-ci.yml
Diffstat (limited to 'debian/patches/startup-message.patch')
| -rw-r--r-- | debian/patches/startup-message.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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; /* |