Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert PXB-3316 completely" #1606

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

## Percona XtraBackup

![PXB logo](storage/innobase/xtrabackup/doc/source/percona-xtrabackup-logo.jpg)
![PXB logo](storage/innobase/xtrabackup/percona-xtrabackup-logo.jpg)

Percona XtraBackup is an open-source hot backup utility for MySQL - based servers that doesn’t lock your database during the backup.

Expand Down
12 changes: 0 additions & 12 deletions cmake/make_dist.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,6 @@ IF(NOT EXISTS ${PACKAGE_DIR}/Docs/INFO_SRC)
CREATE_INFO_SRC(${PACKAGE_DIR}/Docs)
ENDIF()

# Add xtrabackup man pages
SET(MAN_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/storage/innobase/xtrabackup/doc/source/build/man)
SET(MAN_PKG_DIR ${PACKAGE_DIR}/storage/innobase/xtrabackup/doc/source/build/man)

IF(EXISTS ${MAN_BIN_DIR})
FILE(GLOB MAN_FILES RELATIVE ${MAN_BIN_DIR} ${MAN_BIN_DIR}/*.1)
FOREACH(MAN_FILE ${MAN_FILES})
CONFIGURE_FILE(${MAN_BIN_DIR}/${MAN_FILE}
${MAN_PKG_DIR}/${MAN_FILE} COPYONLY)
ENDFOREACH()
ENDIF()

# In case we used CPack, it could have copied some
# extra files that are not usable on different machines.
FILE(REMOVE ${PACKAGE_DIR}/CMakeCache.txt)
Expand Down
4 changes: 4 additions & 0 deletions man/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ FILE(GLOB MAN1_NDB ndb*.1)
FILE(GLOB MAN8 *.8)
FILE(GLOB MAN8_NDB ndb*.8)

IF (WITH_XTRABACKUP)
RETURN()
ENDIF()

IF(MAN1_NDB AND NOT WITH_NDB)
LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
ENDIF()
Expand Down
4 changes: 0 additions & 4 deletions sql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1268,10 +1268,6 @@ ADD_CUSTOM_TARGET(dist
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)

IF(WITH_MAN_PAGES)
ADD_DEPENDENCIES(dist man)
ENDIF()

ADD_CUSTOM_TARGET(distclean
COMMAND ${CMAKE_COMMAND} -E echo WARNING: distclean target is not functional
COMMAND ${CMAKE_COMMAND} -E echo Use 'git clean -fdx' instead
Expand Down
1 change: 0 additions & 1 deletion storage/innobase/xtrabackup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/xbcloud_osenv
)

ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(doc/source)

IF(INSTALL_MYSQLTESTDIR)
INSTALL(
Expand Down
4 changes: 0 additions & 4 deletions storage/innobase/xtrabackup/doc/.gitignore

This file was deleted.

103 changes: 0 additions & 103 deletions storage/innobase/xtrabackup/doc/Makefile

This file was deleted.

Binary file not shown.
Binary file not shown.
9 changes: 0 additions & 9 deletions storage/innobase/xtrabackup/doc/_resource/overrides/404.html

This file was deleted.

59 changes: 0 additions & 59 deletions storage/innobase/xtrabackup/doc/_resource/overrides/main.html

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading