bzr push into mysql-5.5 branch (joerg.bruehe:3556 to 3558)

[Joerg Bruehe]

 3558 Joerg Bruehe	2011-10-07
      Experimental: Try a fix for test "file_contents"
      to help in non-community SuSE RPMs (path name problem).

    modified:
      mysql-test/t/file_contents.test
 3557 Joerg Bruehe	2011-10-07 [merge]
      Make RPM builds succeed in the "itch" tree:
      - Remove duplicate entries in the "spec" file.
      - Remove NDB man pages (would be unpackaged in RPMs).

    modified:
      man/CMakeLists.txt
      support-files/mysql.spec.sh
 3556 Nirbhay Choubey	2011-10-07
      WL#5945 : Improve libedit library
      
      Fix for build failure on Solaris.

    modified:
      cmd-line-utils/libedit/np/strlcat.c
      cmd-line-utils/libedit/np/strlcpy.c
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/np/vis.h
=== modified file 'man/CMakeLists.txt'
--- a/man/CMakeLists.txt	2010-11-13 22:16:52 +0000
+++ b/man/CMakeLists.txt	2011-10-07 16:54:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, 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
@@ -16,15 +16,23 @@
 # Copy man pages
 FILE(GLOB MAN1_FILES *.1)
 FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+FILE(GLOB MAN1_NDB ndb*.1)
 FILE(GLOB MAN8_FILES *.8)
+FILE(GLOB MAN8_NDB ndb*.8)
 IF(MAN1_FILES)
   IF(MAN1_EXCLUDE)
     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
   ENDIF()
+  IF(MAN1_NDB)
+    LIST(REMOVE_ITEM MAN1_FILES ${MAN1_NDB})
+  ENDIF()
   INSTALL(FILES ${MAN1_FILES} DESTINATION ${INSTALL_MANDIR}/man1
   COMPONENT ManPages)
 ENDIF()
 IF(MAN8_FILES)
+  IF(MAN8_NDB)
+    LIST(REMOVE_ITEM MAN8_FILES ${MAN8_NDB})
+  ENDIF()
   INSTALL(FILES ${MAN8_FILES} DESTINATION ${INSTALL_MANDIR}/man8
   COMPONENT ManPages)
 ENDIF()

=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-03-11 15:00:53 +0000
+++ b/mysql-test/t/file_contents.test	2011-10-07 17:01:40 +0000
@@ -15,9 +15,9 @@ if ($dir_bin =~ m|/usr/|) {
   # RPM package
   $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib|/share/doc|;
-  if(-d "$dir_docs/packages/MySQL-server") {
+  if(-d "$dir_docs/packages") {
     # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
@@ -25,9 +25,9 @@ if ($dir_bin =~ m|/usr/|) {
 } elsif ($dir_bin =~ m|/usr$|) {
   # RPM build during development
   $dir_docs = "$dir_bin/share/doc";
-  if(-d "$dir_docs/packages/MySQL-server") {
+  if(-d "$dir_docs/packages") {
     # SuSE
-    $dir_docs = "$dir_docs/packages/MySQL-server";
+    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";

=== 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).