bzr push into mysql-trunk branch (frazer.clement:3779 to 3780)

[Frazer Clement]

 3780 Frazer Clement	2012-05-03
      Second part of not removing MySQL Cluster binary man pages

    modified:
      man/CMakeLists.txt
 3779 Alexander Barkov	2012-05-03
      Bug#11765016 / 57926: ILLEGAL MIX OF COLLATIONS FOR OPERATION 'UNION' .. USING CONCAT/FUNCTION/
      Not a bug. Adding coverage tests.

    modified:
      mysql-test/r/ctype_collate.result
      mysql-test/t/ctype_collate.test
      sql/sql_union.cc
=== modified file 'man/CMakeLists.txt'
--- a/man/CMakeLists.txt	2012-05-03 10:26:04 +0000
+++ b/man/CMakeLists.txt	2012-05-03 10:33:07 +0000
@@ -30,7 +30,7 @@ IF(MAN1_FILES)
   COMPONENT ManPages)
 ENDIF()
 IF(MAN8_FILES)
-  IF(MAN8_NDB)
+  IF(MAN8_NDB AND NOT VERSION MATCHES "-ndb-")
     LIST(REMOVE_ITEM MAN8_FILES ${MAN8_NDB})
   ENDIF()
   INSTALL(FILES ${MAN8_FILES} DESTINATION ${INSTALL_MANDIR}/man8

No bundle (reason: useless for push emails).