1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-15693 Stop packaging data directory into ZIPs

Browse Source 
Remove CMake INSTALL command for COMPONENT DataFiles.

mysql_install_db.exe will calculate default datadir, so that it can be
called without any parameters.
This commit is contained in:
Vladislav Vaintroub 2019-02-19 09:43:24 +01:00
parent 2e6d8fcc17
commit 3dc6f0410b
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/CMakeLists.txt
View File

@ -448,12 +448,6 @@ IF(WIN32 AND TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
ALL ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
) )
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data DESTINATION .
COMPONENT DataFiles
PATTERN "initdb.dep" EXCLUDE
PATTERN "bootstrap.sql" EXCLUDE
PATTERN "aria*" EXCLUDE
)
ELSE() ELSE()
# Not windows or cross compiling, just install an empty directory # Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)

24
sql/mysql_install_db.cc
View File

@ -39,7 +39,8 @@ struct IUnknown;
extern "C" const char* mysql_bootstrap_sql[]; extern "C" const char* mysql_bootstrap_sql[];
char default_os_user[]= "NT AUTHORITY\\NetworkService"; static char default_os_user[]= "NT AUTHORITY\\NetworkService";
static char default_datadir[MAX_PATH];
static int create_db_instance(); static int create_db_instance();
static uint opt_silent; static uint opt_silent;
static char datadir_buffer[FN_REFLEN]; static char datadir_buffer[FN_REFLEN];
@ -169,8 +170,27 @@ int main(int argc, char **argv)
exit(error); exit(error);
if (!opt_datadir) if (!opt_datadir)
{ {
/*
Figure out default data directory. It "data" directory, next to "bin" directory, where
mysql_install_db.exe resides.
*/
strcpy(default_datadir, self_name);
p = strrchr(default_datadir, FN_LIBCHAR);
if (p)
{
*p= 0;
p= strrchr(default_datadir, FN_LIBCHAR);
if (p)
*p= 0;
}
if (!p)
{
die("--datadir option not provided, and default datadir not found");
my_print_help(my_long_options); my_print_help(my_long_options);
die("parameter --datadir=# is mandatory"); }
strncat(default_datadir, "\\data", sizeof(default_datadir));
opt_datadir= default_datadir;
printf("Default data directory is %s\n",opt_datadir);
} }
/* Print some help on errors */ /* Print some help on errors */