List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:May 27 2011 12:47pm
Subject:bzr push into mysql-trunk branch (bjorn.munch:3123 to 3124)
View as plain text  
 3124 Bjorn Munch	2011-05-27 [merge]
      upmerge 12598603

    modified:
      cmake/plugin.cmake
 3123 Dmitry Shulga	2011-05-27 [merge]
      Auto-merge of patch for bug#12546938 from mysql-5.5->mysql-trunk.

    modified:
      mysql-test/r/events_bugs.result
      mysql-test/t/events_bugs.test
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/events.cc
=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2010-11-24 10:50:17 +0000
+++ b/cmake/plugin.cmake	2011-05-27 12:45:38 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Sun Microsystems, Inc
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,6 +27,23 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_
 # [LINK_LIBRARIES lib1...libN]
 # [DEPENDENCIES target1...targetN]
 
+# Append collections files for the plugin to the common files
+# Make sure we don't copy twice if running cmake again
+
+MACRO(PLUGIN_APPEND_COLLECTIONS plugin)
+  SET(fcopied "${CMAKE_CURRENT_SOURCE_DIR}/tests/collections/FilesCopied")
+  IF(EXISTS ${fcopied})
+    RETURN()
+  ENDIF()
+  FILE(GLOB collections ${CMAKE_CURRENT_SOURCE_DIR}/tests/collections/*)
+  FOREACH(cfile ${collections})
+    FILE(READ ${cfile} contents)
+    GET_FILENAME_COMPONENT(fname ${cfile} NAME)
+    FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}")
+    FILE(APPEND ${fcopied} "${fname}\n")
+  ENDFOREACH()
+ENDMACRO()
+
 MACRO(MYSQL_ADD_PLUGIN)
   MYSQL_PARSE_ARGUMENTS(ARG
     "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
@@ -180,6 +197,10 @@ MACRO(MYSQL_ADD_PLUGIN)
     # Install dynamic library
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
     INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
+    # For internal testing in PB2, append collections files
+    IF(DEFINED ENV{PB2WORKDIR})
+      PLUGIN_APPEND_COLLECTIONS(${plugin})
+    ENDIF()
   ELSE()
     IF(WITHOUT_${plugin})
       # Update cache variable

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (bjorn.munch:3123 to 3124) Bjorn Munch27 May