Skip to content

Commit 17f4061

Browse files
committed
WL#16096: Remove mysqlpump and mysql_upgrade
Removes mysqlpump client and the related utilities (lz4_decompress, zlib_decompress). Also removes deprecated mysql_upgrade binary, updates upgrade code to stop generating mysql_upgrade_info file. Change-Id: Iac4ad207edf79ff95203d5f5bb4dc5ac919b27c9
1 parent 4801481 commit 17f4061

File tree

285 files changed

+54
-28023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+54
-28023
lines changed

Diff for: CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,6 @@ INCLUDE(mysql_add_executable)
764764
INCLUDE(curl)
765765
INCLUDE(rapidjson)
766766
INCLUDE(fprofile)
767-
INCLUDE(gloves)
768767
INCLUDE(fido2)
769768
INCLUDE(win_jemalloc)
770769
INCLUDE(libs_mysql_create_library)

Diff for: client/CMakeLists.txt

+2-13
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ ADD_WSHADOW_WARNING()
2525
# We are not interesting in profiling clients.
2626
DISABLE_MISSING_PROFILE_WARNING()
2727

28-
## Subdirectory with common client code.
29-
ADD_SUBDIRECTORY(base)
30-
## Subdirectory for mysqlpump code.
31-
ADD_SUBDIRECTORY(dump)
3228
## Subdirectory for mysql_migrate_keyring code.
3329
ADD_SUBDIRECTORY(migrate_keyring)
3430

@@ -46,16 +42,10 @@ MYSQL_ADD_EXECUTABLE(mysql
4642
multi_factor_passwordopt-vars.cc
4743
multi_option.cc
4844
${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
49-
LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
45+
${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
46+
LINK_LIBRARIES mysqlclient ${EDITLINE_LIBRARY}
5047
)
5148

52-
IF(NOT WITHOUT_SERVER)
53-
MYSQL_ADD_EXECUTABLE(mysql_upgrade
54-
upgrade/program.cc
55-
LINK_LIBRARIES mysqlclient client_base
56-
)
57-
ENDIF()
58-
5949
MYSQL_ADD_EXECUTABLE(mysqltest
6050
mysqltest.cc
6151
mysqltest/error_names.cc
@@ -249,7 +239,6 @@ ENDIF()
249239

250240
SET(MYSQLBINLOG_LIBRARIES
251241
mysql_binlog_event
252-
client_base
253242
mysqlclient
254243
)
255244

Diff for: client/base/CMakeLists.txt

-54
This file was deleted.

Diff for: client/base/abstract_connection_program.cc

-46
This file was deleted.

Diff for: client/base/abstract_connection_program.h

-77
This file was deleted.

Diff for: client/base/abstract_enum_option.h

-73
This file was deleted.

0 commit comments

Comments
 (0)