Auto-merge from mysql-trunk.

This commit is contained in:
Alexander Nozdrin 2010-07-23 17:06:26 +04:00
commit d42d9378c4
2 changed files with 0 additions and 3 deletions

View File

@ -36,6 +36,5 @@ include/config\\\\.h$
include/my_config\\\\.h$
/autom4te\\\\.cache/
errmsg\\\\.sys$
storage/ndb/
#
)

View File

@ -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()