From: Joerg Bruehe
Date: September 28 2011 9:46am
Subject: bzr push into mysql-5.5 branch (joerg.bruehe:3551 to 3552)
List-Archive: http://lists.mysql.com/commits/141179
Message-Id: <201109280946.p8S9kmDm003360@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3552 Joerg Bruehe	2011-09-28
      Fix the spec file: Files must not be mentioned twice in a "%files" list.

    modified:
      support-files/mysql.spec.sh
 3551 Ashish Agarwal	2011-09-27 {clone-5.5.17-build} [merge]
      Bug#11759349 -- Merge of patch from mysql-5.1.

    modified:
      include/heap.h
      mysql-test/r/heap.result
      mysql-test/r/show_check.result
      mysql-test/t/heap.test
      mysql-test/t/show_check.test
      storage/heap/ha_heap.cc
      storage/heap/hp_create.c
      storage/heap/hp_info.c
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-09-21 10:40:41 +0000
+++ b/support-files/mysql.spec.sh	2011-09-28 09:43:16 +0000
@@ -1002,7 +1002,6 @@ echo "====="                            
 %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
@@ -1020,7 +1019,6 @@ echo "====="                            
 %attr(755, root, root) %{_bindir}/mysql_setpermission
 %attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
 %attr(755, root, root) %{_bindir}/mysql_upgrade
-%attr(755, root, root) %{_bindir}/mysql_plugin
 %attr(755, root, root) %{_bindir}/mysql_zap
 %attr(755, root, root) %{_bindir}/mysqlbug
 %attr(755, root, root) %{_bindir}/mysqld_multi
@@ -1131,6 +1129,11 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
 * Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@stripped>
 
 - Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to

No bundle (reason: useless for push emails).