Skip to content

Commit 54f162b

Browse files
bjornmubjornmu
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents e7c1264 + 79c0c20 commit 54f162b

File tree

7 files changed

+49
-37
lines changed

7 files changed

+49
-37
lines changed

‎packaging/deb-in/mysql-packagesource-server.install.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ usr/share/man/man1/myisamchk.1
4545
usr/share/man/man1/myisamlog.1
4646
usr/share/man/man1/myisampack.1
4747
usr/share/man/man1/my_print_defaults.1
48-
usr/share/man/man1/mysql-stress-test.pl.1
4948
usr/share/man/man1/mysql_convert_table_format.1
5049
usr/share/man/man1/mysql_install_db.1
5150
usr/share/man/man1/mysql_secure_installation.1

‎packaging/deb-in/mysql-packagesource-test.install.in‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ usr/bin/mysql_client_test
1818
usr/bin/mysql_client_test_embedded
1919
usr/bin/mysqltest
2020
usr/bin/mysqltest_embedded
21-
# manpages
22-
usr/share/man/man1/mysql_client_test.1
23-
usr/share/man/man1/mysql_client_test_embedded.1
24-
usr/share/man/man1/mysql-test-run.pl.1
25-
usr/share/man/man1/mysqltest.1
26-
usr/share/man/man1/mysqltest_embedded.1
2721
# plugins
2822
usr/lib/mysql/plugin/auth.so
2923
usr/lib/mysql/plugin/auth_test_plugin.so

‎packaging/deb-in/rules.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,8 @@ override_dh_install:
102102
-Xusr/share/mysql/binary-configure \
103103
-Xusr/share/mysql/docs/mysql.info \
104104
-Xusr/share/man/man1/mysqlman.1 \
105+
-Xusr/share/man/man1/mysqltest \
106+
-Xusr/share/man/man1/mysql_client_test \
107+
-Xusr/share/man/man1/mysql-stress-test.pl.1 \
108+
-Xusr/share/man/man1/mysql-test-run.pl.1 \
105109
-X.h.pp

‎packaging/rpm-fedora/mysql.spec.in‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
440440
rm -rf %{buildroot}%{_bindir}/mysql_setpermission
441441
rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
442442

443+
# Remove obsoleted man pages
444+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
445+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
446+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
447+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
448+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
449+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
450+
443451
%check
444452
%if 0%{?runselftest}
445453
pushd release
@@ -698,13 +706,6 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
698706
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
699707
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
700708

701-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
702-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
703-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
704-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
705-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
706-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
707-
708709
%files bench
709710
%defattr(-, root, root, -)
710711
%doc %{?license_files_server}
@@ -725,6 +726,9 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
725726
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
726727

727728
%changelog
729+
* Tue Oct 31 2017 Bjorn Munch <[email protected]> - 5.6.39-1
730+
- Remove obsoleted mysqltest man pages
731+
728732
* Mon Oct 31 2016 Balasubramanian Kandasamy <[email protected]> - 5.6.35-1
729733
- Add connection_control.so to server subpackage
730734

‎packaging/rpm-oel/mysql.spec.in‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -613,6 +613,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
613613
rm -rf %{buildroot}%{_bindir}/mysql_setpermission
614614
rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
615615

616+
# Remove obsoleted man pages
617+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
618+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
619+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
620+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
621+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
622+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
623+
616624
%check
617625
%if 0%{?runselftest}
618626
pushd release
@@ -702,7 +710,6 @@ fi
702710
%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
703711
%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
704712
%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
705-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
706713
%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
707714
%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
708715
%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
@@ -924,11 +931,6 @@ fi
924931
%attr(755, root, root) %{_bindir}/mysql_client_test
925932
%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
926933
%attr(755, root, root) %{_bindir}/mysqltest_embedded
927-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
928-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
929-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
930-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
931-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
932934

933935
%files bench
934936
%defattr(-, root, root, -)
@@ -956,6 +958,9 @@ fi
956958
%endif
957959

958960
%changelog
961+
* Tue Oct 31 2017 Bjorn Munch <[email protected]> - 5.6.39-1
962+
- Remove obsoleted mysqltest man pages
963+
959964
* Mon Oct 31 2016 Balasubramanian Kandasamy <[email protected]> - 5.6.35-1
960965
- Add connection_control.so to server subpackage
961966

‎packaging/rpm-sles/mysql.spec.in‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -476,6 +476,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_setpermission
476476
rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
477477
rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
478478

479+
# Remove obsoleted man pages
480+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
481+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
482+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
483+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
484+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
485+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
486+
479487
# rcmysql symlink
480488
install -d %{buildroot}%{_sbindir}
481489
%if 0%{?systemd}
@@ -577,7 +585,6 @@ fi
577585
%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
578586
%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
579587
%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
580-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
581588
%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
582589
%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
583590
%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
@@ -799,13 +806,6 @@ fi
799806
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
800807
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
801808

802-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
803-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
804-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
805-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
806-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
807-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
808-
809809
%files bench
810810
%defattr(-, root, root, -)
811811
%doc %{?license_files_server}
@@ -826,6 +826,9 @@ fi
826826
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
827827

828828
%changelog
829+
* Tue Oct 31 2017 Bjorn Munch <[email protected]> - 5.6.39-1
830+
- Remove obsoleted mysqltest man pages
831+
829832
* Mon Oct 31 2016 Balasubramanian Kandasamy <[email protected]> - 5.6.35-1
830833
- Add connection_control.so to server subpackage
831834

‎support-files/mysql.spec.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -604,6 +604,12 @@ install -m 644 "%{malloc_lib_source}" \
604604
# Remove man pages we explicitly do not want to package, avoids 'unpackaged
605605
# files' warning.
606606
# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
607+
rm -f $RBR%{_mandir}/man1/mysql-stress-test.pl.1
608+
rm -f $RBR%{_mandir}/man1/mysql-test-run.pl.1
609+
rm -f $RBR%{_mandir}/man1/mysql_client_test.1
610+
rm -f $RBR%{_mandir}/man1/mysql_client_test_embedded.1
611+
rm -f $RBR%{_mandir}/man1/mysqltest.1
612+
rm -f $RBR%{_mandir}/man1/mysqltest_embedded.1
607613

608614
##############################################################################
609615
# Post processing actions, i.e. when installed
@@ -1081,7 +1087,6 @@ echo "=====" >> $STATUS_HISTORY
10811087
%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
10821088
%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
10831089
%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
1084-
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
10851090
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
10861091
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
10871092
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
@@ -1212,11 +1217,6 @@ echo "=====" >> $STATUS_HISTORY
12121217
%attr(755, root, root) %{_bindir}/mysql_client_test
12131218
%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
12141219
%attr(755, root, root) %{_bindir}/mysqltest_embedded
1215-
%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
1216-
%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
1217-
%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
1218-
%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
1219-
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
12201220

12211221
# ----------------------------------------------------------------------------
12221222
%files -n MySQL-embedded%{product_suffix}
@@ -1234,6 +1234,9 @@ echo "=====" >> $STATUS_HISTORY
12341234
# merging BK trees)
12351235
##############################################################################
12361236
%changelog
1237+
* Tue Oct 31 2017 Bjorn Munch <[email protected]>
1238+
- Remove obsoleted mysqltest man pages
1239+
12371240
* Mon Oct 06 2014 Balasubramanian Kandasamy <[email protected]>
12381241
- Add license info in each subpackage
12391242

0 commit comments

Comments
 (0)