diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-19 14:14:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-12-15 19:13:57 +0100 |
| commit | 4d3ac328482ea2e363cb0be00fd8654d0af5cce0 (patch) | |
| tree | c40e77b41e0be62dca2a6a181aed60c52630c2f6 /sql/CMakeLists.txt | |
| parent | ea0a5cb0a4efbca1fc35885599e07baf10dc3e9e (diff) | |
| download | mariadb-git-4d3ac328482ea2e363cb0be00fd8654d0af5cce0.tar.gz | |
MDEV-27093 Do not pass root password in HEX(clear text) from mariadb-install-db.exe to bootstrap
Previously, password was passed as hex(clear_text_password).
The hex encoding was used to avoid masking apostrophe and backslash etc.
However, bootstrap still manages to misinterpert UTF8 password, so that
root would not connect later.
So the fix is to compute the native password hash inside mysql_install_db
already instead, and create user with that hash, rather than letting bootstrap
calculate it by using PASSWORD() function.
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 972cc0b736c..848495190b2 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -481,10 +481,11 @@ IF(WIN32) MYSQL_ADD_EXECUTABLE(mariadb-install-db mysql_install_db.cc ${CMAKE_CURRENT_BINARY_DIR}/mysql_bootstrap_sql.c + password.c COMPONENT Server ) SET_TARGET_PROPERTIES(mariadb-install-db PROPERTIES COMPILE_FLAGS -DINSTALL_PLUGINDIR=${INSTALL_PLUGINDIR}) - TARGET_LINK_LIBRARIES(mariadb-install-db mysys shlwapi) + TARGET_LINK_LIBRARIES(mariadb-install-db mysys mysys_ssl shlwapi) ADD_LIBRARY(winservice STATIC winservice.c) TARGET_LINK_LIBRARIES(winservice shell32) |