bzr push into mysql-trunk branch (jon.hauglid:3397 to 3398)

[Jon Olav Hauglid]

 3398 Jon Olav Hauglid	2011-08-22
      Cherrypick from mysql-5.5-security of:
      
      ------------------------------------------------------------
      revno: 3222
      committer: Georgi Kodinov <Georgi.Kodinov@stripped>
      branch nick: B11765565-5.5-security
      timestamp: Fri 2011-08-12 15:14:31 +0300
      message:
        Bug #11765565: 58548: 5.5.X NEEDS TO LINK TO THE CORESERVICES FRAMEWORK 
          FOR SOME PLUGINS TO WORK
        
        Some dynamically loadable plugins on the Mac may need functions from the 
        CoreServices framework. Unfortunately the only place where this can be initialized
        is the main executable. Thus to allow plugins to use functions from that framework
        the mysqld binary needs to link to the framework.

    modified:
      sql/CMakeLists.txt
 3397 Vasil Dimov	2011-08-22
      Replay vasil.dimov@stripped which I
      reverted last week because it was suspected for causing failures it did
      not.
      
        * revision-id vasil.dimov@stripped
        * committer Vasil Dimov <vasil.dimov@stripped>
        * branch nick mysql-trunk
        * timestamp Wed 2011-08-17 21:50:46 +0300
        * message
        *   Blind attempt to fix BUG 12881278 - MAIN.MYISAM TEST FAILS ON LINUX
        *   
        *   The printed text is truncated on char 63:
        *   
        *     "MySQL thread id 1236, OS thread handle 0x7ff187b96700, query id"
        *   
        *   still I do not understand how this truncation could have caused the
        *   main.myisam failure but anyway - the buffer needs to be increased.

    modified:
      sql/sql_class.cc
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-08-19 13:21:02 +0000
+++ b/sql/CMakeLists.txt	2011-08-22 10:28:31 +0000
@@ -221,6 +221,14 @@ ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server)
 
+IF(APPLE) 
+  # Add CoreServices framework since some dloadable plugins may need it 
+  FIND_LIBRARY(CORESERVICES NAMES CoreServices) 
+  IF(CORESERVICES) 
+    TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) 
+  ENDIF() 
+ENDIF() 
+
 IF(NOT WITHOUT_DYNAMIC_PLUGINS)
   SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
   GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS)

No bundle (reason: useless for push emails).