bzr push into mysql-pe branch (vvaintroub:3649 to 3650)

[Vladislav Vaintroub]

 3650 Vladislav Vaintroub	2009-11-03
      fix windows build

    modified:
      storage/mysql_storage_engine.cmake
 3649 Luis Soares	2009-11-02 [merge]
      Auto-merging mysql-5.1-bugteam-gca into mysql-pe.

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      sql/sql_load.cc
=== modified file 'storage/mysql_storage_engine.cmake'
--- a/storage/mysql_storage_engine.cmake	2009-10-08 13:04:36 +0000
+++ b/storage/mysql_storage_engine.cmake	2009-11-02 23:16:15 +0000
@@ -34,7 +34,7 @@ IF(NOT SOURCE_SUBLIBS)
     #The dll is linked to the mysqld executable
     SET(dyn_libname ha_${libname})
     ADD_LIBRARY(${dyn_libname} SHARED ${${engine}_SOURCES})
-    TARGET_LINK_LIBRARIES (${dyn_libname}  mysqld)
+    TARGET_LINK_LIBRARIES (${dyn_libname}  mysqld libservices)
     IF(${engine}_LIBS)
       TARGET_LINK_LIBRARIES(${dyn_libname} ${${engine}_LIBS})
     ENDIF(${engine}_LIBS)


Attachment: [text/bzr-bundle] bzr/[e-mail]