List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:January 3 2011 1:38pm
Subject:bzr push into mysql-5.5 branch (tor.didriksen:3214 to 3215)
View as plain text  
 3215 Tor Didriksen	2011-01-03
      Add mysys to mysqld dependencies, trying to un-break the build on debian

    modified:
      sql/CMakeLists.txt
 3214 Guilhem Bichot	2010-12-31 [merge]
      merge from 5.1; now this test is not experimental anymore

    renamed:
      mysql-test/suite/funcs_1/r/myisam_views.result => mysql-test/suite/funcs_1/r/myisam_views-big.result
      mysql-test/suite/funcs_1/t/myisam_views.test => mysql-test/suite/funcs_1/t/myisam_views-big.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/suite/funcs_1/t/myisam_views-big.test
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-11-20 14:47:50 +0000
+++ b/sql/CMakeLists.txt	2011-01-03 13:08:48 +0000
@@ -132,7 +132,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
 ENDIF()
 
 SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) 
-TARGET_LINK_LIBRARIES(mysqld sql)
+TARGET_LINK_LIBRARIES(mysqld sql mysys)
 
 # Provide plugins with minimal set of libraries
 SET(INTERFACE_LIBS ${LIBRT})

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (tor.didriksen:3214 to 3215) Tor Didriksen3 Jan