From: Bjorn Munch
Date: June 1 2011 1:25pm
Subject: bzr push into mysql-5.5 branch (bjorn.munch:3419 to 3420)
List-Archive: http://lists.mysql.com/commits/138548
Message-Id: <201106011325.p51DPYtr020178@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3420 Bjorn Munch	2011-06-01
      Followup to 12607800, testing it in PB2 didn't work, trying again
      Be more explicit about path to (potential) plugin tests dirs

    modified:
      cmake/install_layout.cmake
 3419 Jon Olav Hauglid	2011-06-01
      Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING
                   SECONDARY INDEX IN INNODB
      
      This is a follow-up patch.
      
      This patch moves part of the new test coverage to a test
      file that is only run on debug builds since it used debug-
      only features and therefore broke the test case on
      release builds.

    modified:
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_sync.test
=== modified file 'cmake/install_layout.cmake'
--- a/cmake/install_layout.cmake	2011-06-01 10:15:01 +0000
+++ b/cmake/install_layout.cmake	2011-06-01 13:19:36 +0000
@@ -103,7 +103,7 @@ ENDIF()
 # just use if(INSTALL_PLUGINTESTDIR).
 # The plugin must set its own install path for tests
 #
-FILE(GLOB plugin_tests plugin/*/tests)
+FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests)
 
 #
 # STANDALONE layout

No bundle (reason: useless for push emails).