From 75c0c34f79925571262d95d9ce168c0d2af5f7e3 Mon Sep 17 00:00:00 2001 From: Tor Didriksen Date: Thu, 10 Jan 2019 16:04:48 +0100 Subject: [PATCH] Bug#29178542 BACKPORT BUG#26115002 TO 5.6 This is a backport to 5.6 of: Bug #26115002 UDF_EXAMPLE BINARY NOT PACKAGED Package it in test package RPM and DEB packaging updated to reflect that Change-Id: I5de71d4689acd9b1fba03abc6ec58a4e44db30fd --- packaging/deb-in/deb_debug.cmake | 3 ++- packaging/deb-in/mysql-packagesource-test.install.in | 3 ++- packaging/deb-in/source/include-binaries | 3 ++- packaging/rpm-docker/mysql.spec.in | 4 ++-- packaging/rpm-fedora/mysql.spec.in | 4 +++- packaging/rpm-oel/mysql.spec.in | 4 +++- packaging/rpm-sles/mysql.spec.in | 4 +++- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packaging/deb-in/deb_debug.cmake b/packaging/deb-in/deb_debug.cmake index 59f41583c103..41450c265f3f 100644 --- a/packaging/deb-in/deb_debug.cmake +++ b/packaging/deb-in/deb_debug.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -87,4 +87,5 @@ usr/lib/mysql/plugin/debug/qa_auth_client.so usr/lib/mysql/plugin/debug/qa_auth_interface.so usr/lib/mysql/plugin/debug/qa_auth_server.so usr/lib/mysql/plugin/debug/test_udf_services.so +usr/lib/mysql/plugin/debug/udf_example.so ") diff --git a/packaging/deb-in/mysql-packagesource-test.install.in b/packaging/deb-in/mysql-packagesource-test.install.in index 092dd06d8835..86d53889940e 100644 --- a/packaging/deb-in/mysql-packagesource-test.install.in +++ b/packaging/deb-in/mysql-packagesource-test.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ usr/lib/mysql/plugin/qa_auth_client.so usr/lib/mysql/plugin/qa_auth_interface.so usr/lib/mysql/plugin/qa_auth_server.so usr/lib/mysql/plugin/test_udf_services.so +usr/lib/mysql/plugin/udf_example.so @DEB_INSTALL_DEBUG_TEST_PLUGINS@ # test suite usr/lib/mysql-test/* diff --git a/packaging/deb-in/source/include-binaries b/packaging/deb-in/source/include-binaries index ca1410153aa5..e5817e226dd1 100644 --- a/packaging/deb-in/source/include-binaries +++ b/packaging/deb-in/source/include-binaries @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,6 +66,7 @@ debian/extra/rewrite_example-plugin debian/extra/semisync_master-plugin debian/extra/semisync_slave-plugin debian/extra/test_udf_services-plugin +debian/extra/udf_example-plugin debian/extra/test_security_context-plugin debian/extra/test_services_plugin_registry-plugin debian/extra/validate_password-plugin diff --git a/packaging/rpm-docker/mysql.spec.in b/packaging/rpm-docker/mysql.spec.in index 96cf525ce2a2..f16ba159e735 100644 --- a/packaging/rpm-docker/mysql.spec.in +++ b/packaging/rpm-docker/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -190,7 +190,7 @@ done # Remove test plugins for p in auth.so auth_test_plugin.so daemon_example.ini libdaemon_example.so qa_auth_client.so \ qa_auth_interface.so qa_auth_server.so replication_observers_example_plugin.so ha_example.so \ - test_udf_services.so ; do + test_udf_services.so udf_example.so ; do rm -f %{buildroot}%{_libdir}/mysql/plugin/$p done diff --git a/packaging/rpm-fedora/mysql.spec.in b/packaging/rpm-fedora/mysql.spec.in index 449d07552253..6e3d44579d0d 100644 --- a/packaging/rpm-fedora/mysql.spec.in +++ b/packaging/rpm-fedora/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -687,6 +687,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so @@ -694,6 +695,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 03654a3b5bac..5cbc5dcdcf32 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -771,6 +771,7 @@ fi %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so @@ -778,6 +779,7 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in index 44e1ac95042b..320f4ccdceaa 100644 --- a/packaging/rpm-sles/mysql.spec.in +++ b/packaging/rpm-sles/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -787,6 +787,7 @@ fi %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so @@ -794,6 +795,7 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so