From: Bjorn Munch
Date: November 26 2012 2:21pm
Subject: bzr push into mysql-5.5 branch (bjorn.munch:4078 to 4079)
List-Archive: http://lists.mysql.com/commits/145392
Message-Id: <20121126142102.8994.26343.4079@khepri15.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4079 Bjorn Munch	2012-11-26
      Reinstate install of mysql-test/lib/My/SafeProcess/Base.pm, removed by mistake

    modified:
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
 4078 sayantan.dutta@stripped	2012-11-26 [merge]
       upmerge 5.1 => 5.5

    removed:
      mysql-test/lib/My/SafeProcess/safe_process.pl
    modified:
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysql-test/lib/My/SafeProcess/safe_process.cc
=== modified file 'mysql-test/lib/My/SafeProcess/CMakeLists.txt'
--- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2012-11-26 10:46:49 +0000
+++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt	2012-11-26 14:14:26 +0000
@@ -29,3 +29,4 @@ INSTALL(TARGETS my_safe_process DESTINAT
 IF(WIN32)
   INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
 ENDIF()
+INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)

No bundle (reason: useless for push emails).