Auto-merge from mysql-trunk.

d42d9378 · Alexander Nozdrin · bb2a8df3 · 76f80ae9 · d42d9378 · d42d9378
Commit d42d9378 authored Jul 23, 2010 by Alexander Nozdrin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

cmake/cpack_source_ignore_files.cmake cmake/cpack_source_ignore_files.cmake +0 -1

cmake/make_dist.cmake.in cmake/make_dist.cmake.in +0 -2

No files found.
--- a/cmake/cpack_source_ignore_files.cmake
+++ b/cmake/cpack_source_ignore_files.cmake
@@ -36,6 +36,5 @@ include/config\\\\.h$
 include/my_config\\\\.h$
 /autom4te\\\\.cache/
 errmsg\\\\.sys$
-storage/ndb/
 #
 )
--- a/cmake/make_dist.cmake.in
+++ b/cmake/make_dist.cmake.in
@@ -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()