bzr push into mysql-5.5 branch (tor.didriksen:3687 to 3688) Bug#13551687

[Tor Didriksen]

 3688 Tor Didriksen	2012-01-16
      Bug#13551687 CMAKE GENERATED PROJECT FILES ALWAYS HAVE THE SAME NAME IN VISUAL STUDIO
      
      Add option to set project name for Mac/Windows.

    modified:
      CMakeLists.txt
 3687 Nuno Carvalho	2012-01-16 [merge]
      Automerge from mysql-5.1 to mysql-5.5.

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-07-03 23:48:19 +0000
+++ b/CMakeLists.txt	2012-01-16 11:39:12 +0000
@@ -79,8 +79,19 @@ ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_
   SET(OLD_WITH_DEBUG 0 CACHE INTERNAL "" FORCE)
 ENDIF()
 
+# Optionally set project name, e.g.
+# foo.xcodeproj (mac) or foo.sln (windows)
+SET(MYSQL_PROJECT_NAME_DOCSTRING "MySQL project name")
+IF(DEFINED MYSQL_PROJECT_NAME)
+  SET(MYSQL_PROJECT_NAME ${MYSQL_PROJECT_NAME} CACHE STRING
+      ${MYSQL_PROJECT_NAME_DOCSTRING} FORCE)
+ELSE()
+  SET(MYSQL_PROJECT_NAME "MySQL" CACHE STRING
+      ${MYSQL_PROJECT_NAME_DOCSTRING} FORCE)
+  MARK_AS_ADVANCED(MYSQL_PROJECT_NAME)
+ENDIF()
+PROJECT(${MYSQL_PROJECT_NAME})
 
-PROJECT(MySQL)
 IF(BUILD_CONFIG)
   INCLUDE(
   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)

No bundle (reason: useless for push emails).