List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:July 20 2010 9:38am
Subject:bzr commit into mysql-next-mr-bugfixing branch (jonathan.perkin:3318)
View as plain text  
#At file:///Users/jonathan/bzr2/mysql-next-mr-bugfixing/ based on revid:alik@ibmvm-20100720081038-awg13xvw8pjmhw1s

 3318 Jonathan Perkin	2010-07-20 [merge]
      Merge from mysql-trunk-bugfixing

    modified:
      cmake/cpack_source_ignore_files.cmake
      cmake/make_dist.cmake.in
=== modified file 'cmake/cpack_source_ignore_files.cmake'
--- a/cmake/cpack_source_ignore_files.cmake	2010-07-19 14:17:07 +0000
+++ b/cmake/cpack_source_ignore_files.cmake	2010-07-20 09:37:50 +0000
@@ -54,6 +54,5 @@ errmsg\\\\.sys$
 run_collection_test-bt.cmake
 run_collection_test-bt-debug.cmake
 run_collection_test-bt-fast.cmake
-storage/ndb/
 #
 )

=== modified file 'cmake/make_dist.cmake.in'
--- a/cmake/make_dist.cmake.in	2010-06-23 12:36:19 +0000
+++ b/cmake/make_dist.cmake.in	2010-07-20 09:35:55 +0000
@@ -53,8 +53,6 @@ IF(BZR_EXECUTABLE)
     RESULT_VARIABLE RESULT
   )
 
-  FILE(REMOVE_RECURSE ${PACKAGE_DIR}/storage/ndb)
-
   IF(NOT RESULT EQUAL 0)
    SET(BZR_EXECUTABLE)
   ENDIF()


Attachment: [text/bzr-bundle] bzr/jonathan.perkin@oracle.com-20100720093750-rt0yym16se4xi5lq.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (jonathan.perkin:3318) Jonathan Perkin20 Jul