bzr push into mysql-trunk branch (daniel.fischer:3187 to 3188)

[Daniel Fischer]

 3188 Daniel Fischer	2011-06-10 [merge]
      merge

    modified:
      cmake/plugin.cmake
 3187 Dmitry Shulga	2011-06-10
      Follow-up patch for bug#11753738.

    modified:
      mysql-test/r/trigger.result
=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2011-06-10 07:13:51 +0000
+++ b/cmake/plugin.cmake	2011-06-10 14:12:38 +0000
@@ -32,16 +32,15 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_
 
 MACRO(PLUGIN_APPEND_COLLECTIONS plugin)
   SET(fcopied "${CMAKE_CURRENT_SOURCE_DIR}/tests/collections/FilesCopied")
-  IF(EXISTS ${fcopied})
-    RETURN()
+  IF(NOT EXISTS ${fcopied})
+    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()
   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)

No bundle (reason: useless for push emails).