Skip to content

Commit f7a42ca

Browse files
bjornmuprashanttekriwal
bjornmu
authored and
prashanttekriwal
committed
Merge branch 'mysql-5.6' into mysql-5.7
(cherry picked from commit 26429d55448d54c7e0ecf070956e48fdcfca603a)
1 parent 4175f93 commit f7a42ca

File tree

6 files changed

+37
-28
lines changed

6 files changed

+37
-28
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ usr/share/man/man1/myisamchk.1
4343
usr/share/man/man1/myisamlog.1
4444
usr/share/man/man1/myisampack.1
4545
usr/share/man/man1/my_print_defaults.1
46-
usr/share/man/man1/mysql-stress-test.pl.1
4746
usr/share/man/man1/mysql_install_db.1
4847
usr/share/man/man1/mysql_plugin.1
4948
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
@@ -19,12 +19,6 @@ usr/bin/mysql_client_test_embedded
1919
usr/bin/mysqltest
2020
usr/bin/mysqltest_embedded
2121
usr/bin/mysqlxtest
22-
# manpages
23-
usr/share/man/man1/mysql_client_test.1
24-
usr/share/man/man1/mysql_client_test_embedded.1
25-
usr/share/man/man1/mysql-test-run.pl.1
26-
usr/share/man/man1/mysqltest.1
27-
usr/share/man/man1/mysqltest_embedded.1
2822
# plugins
2923
usr/lib/mysql/plugin/auth.so
3024
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
@@ -141,4 +141,8 @@ override_dh_install:
141141
-Xusr/share/mysql/README \
142142
-Xusr/share/mysql/docs/mysql.info \
143143
-Xusr/share/man/man1/mysqlman.1 \
144+
-Xusr/share/man/man1/mysqltest \
145+
-Xusr/share/man/man1/mysql_client_test \
146+
-Xusr/share/man/man1/mysql-stress-test.pl.1 \
147+
-Xusr/share/man/man1/mysql-test-run.pl.1 \
144148
-X.h.pp

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,14 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
500500
rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
501501
rm -rf %{buildroot}%{_bindir}/mysql_embedded
502502

503+
# Remove obsoleted man pages
504+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
505+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
506+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
507+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
508+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
509+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
510+
503511
# Remove upcoming man pages, to avoid breakage when they materialize
504512
# Keep this comment as a placeholder for future cases
505513
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -828,13 +836,6 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
828836
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
829837
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_security_context.so
830838

831-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
832-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
833-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
834-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
835-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
836-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
837-
838839
%files embedded
839840
%defattr(-, root, root, -)
840841
%doc %{?license_files_server}
@@ -857,6 +858,9 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
857858
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
858859

859860
%changelog
861+
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.21-1
862+
- Remove obsoleted mysqltest man pages
863+
860864
* Tue Sep 13 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.16-1
861865
- Add connection_control.so to server subpackage
862866

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,14 @@ rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
833833
rm -rf %{buildroot}%{_bindir}/mysql_embedded
834834
rm -f %{buildroot}%{_datadir}/mysql/audit_log_filter_win_install.sql
835835

836+
# Remove obsoleted man pages
837+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
838+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
839+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
840+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
841+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
842+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
843+
836844
# Remove upcoming man pages, to avoid breakage when they materialize
837845
# Keep this comment as a placeholder for future cases
838846
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -1295,13 +1303,6 @@ fi
12951303
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
12961304
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_security_context.so
12971305

1298-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
1299-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
1300-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
1301-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
1302-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
1303-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
1304-
13051306
%files embedded
13061307
%defattr(-, root, root, -)
13071308
%doc %{?license_files_server}
@@ -1386,6 +1387,9 @@ fi
13861387
%endif # cluster
13871388

13881389
%changelog
1390+
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.21-1
1391+
- Remove obsoleted mysqltest man pages
1392+
13891393
* Fri May 26 2017 Harin Vadodaria <harin.vadodaria@oracle.com> - 5.7.19-1
13901394
- Add keyring_aws.so plugin to commercial server subpackage
13911395

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
643643
rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
644644
rm -f %{buildroot}%{_datadir}/mysql/audit_log_filter_win_install.sql
645645

646+
# Remove obsoleted man pages
647+
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
648+
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
649+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
650+
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
651+
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
652+
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
653+
646654
# Remove upcoming man pages, to avoid breakage when they materialize
647655
# Keep this comment as a placeholder for future cases
648656
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -1113,13 +1121,6 @@ fi
11131121
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
11141122
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_security_context.so
11151123

1116-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
1117-
%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
1118-
%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
1119-
%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
1120-
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
1121-
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
1122-
11231124
%files embedded
11241125
%defattr(-, root, root, -)
11251126
%doc %{?license_files_server}
@@ -1189,6 +1190,9 @@ fi
11891190
%endif # cluster
11901191

11911192
%changelog
1193+
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.21-1
1194+
- Remove obsoleted mysqltest man pages
1195+
11921196
* Fri May 26 2017 Harin Vadodaria <harin.vadodaria@oracle.com> - 5.7.19-1
11931197
- Add keyring_aws.so plugin to commercial server subpackage
11941198

0 commit comments

Comments
 (0)