Skip to content

Commit 493f486

Browse files
committed
WL#9071: Remove mysql_install_db and server --bootstrap option
This patch has three logical parts: 1. Remove the 'mysql_install_db' executable and all references to it from elsewhere. Remove associated MTR tests, unit tests, comments mentioning it, as well as additional source code used only by that executable. Rewrite 'scripts/mysqld_multi.sh' to use 'mysqld --initialize' rather than 'mysql_install_db'. Note: Usage of 'mysql_install_db' from MySQL Cluster test environment will be fixed by Cluster devs outside the scope of this WL. 2. Remove the deprecated '--bootstrap' option, and the '--install-server' option (which has not been released). Replace the variables representing these options by the variable representing the '--initialize' option. Update or remove tests and scripts referring to these variables. 3. Remove support for MTR_VERSION=1. This is dependent on the deprecated '--bootstrap' option, and is therefore removed.
1 parent 8a1e913 commit 493f486

Some content is hidden

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

68 files changed

+123
-14244
lines changed

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,6 @@ ndbcluster-1186/ndb_3_out.log
17811781
ndbcluster-1186/ndbcluster.pid
17821782
netware/.deps/libmysqlmain.Po
17831783
netware/.deps/my_manage.Po
1784-
netware/.deps/mysql_install_db.Po
17851784
netware/.deps/mysql_test_run.Po
17861785
netware/.deps/mysqld_safe.Po
17871786
netware/init_db.sql
@@ -1840,7 +1839,6 @@ scripts/mysql_fix_privilege_tables.sql
18401839
scripts/mysql_fix_privilege_tables.sql.rule
18411840
scripts/mysql_fix_privilege_tables_sql.c
18421841
scripts/mysql_fix_privilege_tables_sql.c.rule
1843-
scripts/mysql_install_db
18441842
scripts/mysql_secure_installation
18451843
scripts/mysql_server_config
18461844
scripts/mysql_tableinfo
@@ -3114,7 +3112,6 @@ sql/gen_lex_token
31143112
internal/plugin/thread_pool/src/thread_pool_config.h
31153113
internal/tests/innorwlocktest
31163114
packaging/solaris/postinstall-solaris
3117-
client/mysql_install_db
31183115
internal/tests/open_files_limit
31193116
client/mysql_ssl_rsa_setup
31203117

client/CMakeLists.txt

-11
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,6 @@ TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
116116
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
117117
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
118118

119-
IF(UNIX AND NOT WITHOUT_SERVER)
120-
MYSQL_ADD_EXECUTABLE(mysql_install_db
121-
mysql_install_db.cc auth_utils.cc path.cc logger.cc)
122-
TARGET_LINK_LIBRARIES(mysql_install_db mysqlclient)
123-
ADD_COMPILE_FLAGS(
124-
auth_utils.cc mysql_install_db.cc
125-
COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql/auth"
126-
)
127-
ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
128-
ENDIF()
129-
130119
MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
131120
TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
132121
SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)

client/auth_utils.cc

-129
This file was deleted.

client/auth_utils.h

-133
This file was deleted.

0 commit comments

Comments
 (0)