database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mariadb-tzinfo-to-sql,mariadb-dumpslow as Client components

Browse Source
This commit is contained in:
Daniel Black
2021-03-28 12:48:53 +11:00
parent f377081ea9
commit d1ee7163bc
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
man/CMakeLists.txt
View File

@@ -20,9 +20,8 @@ SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1 myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1
mysql_fix_extensions.1 mysql_fix_extensions.1
mysql_install_db.1 mysql_install_db.1
mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_upgrade.1
mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqld_multi.1 mysqld_safe.1
perror.1 resolve_stack_dump.1
resolveip.1 mariadb-service-convert.1 resolveip.1 mariadb-service-convert.1
mysqld_safe_helper.1 mysqld_safe_helper.1
wsrep_sst_mysqldump.1 wsrep_sst_mysqldump.1
@@ -31,11 +30,13 @@ SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
mbstream.1 mariabackup.1 ${MAN1_WSREP}) mbstream.1 mariabackup.1 ${MAN1_WSREP})
SET(MAN8_SERVER mysqld.8) SET(MAN8_SERVER mysqld.8)
SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
mysqldumpslow.1
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
mysql_plugin.1 mysql_embedded.1 my_print_defaults.1 mysql_plugin.1 mysql_embedded.1 my_print_defaults.1
mysqlhotcopy.1 mysql_setpermission.1 mysqlhotcopy.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1
mysql_convert_table_format.1 replace.1 mysql_secure_installation.1) mysql_convert_table_format.1 replace.1 mysql_secure_installation.1
perror.1 resolve_stack_dump.1)
SET(MAN1_DEVEL mysql_config.1) SET(MAN1_DEVEL mysql_config.1)
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1 mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1

2
scripts/CMakeLists.txt
View File

@@ -256,6 +256,7 @@ SET(mariadb-hotcopy_COMPONENT COMPONENT Client)
SET(mariadb-convert-table-format_COMPONENT COMPONENT Client) SET(mariadb-convert-table-format_COMPONENT COMPONENT Client)
SET(mariadb-setpermission_COMPONENT COMPONENT Client) SET(mariadb-setpermission_COMPONENT COMPONENT Client)
SET(mariadb-secure-installation_COMPONENT COMPONENT Client) SET(mariadb-secure-installation_COMPONENT COMPONENT Client)
SET(mariadb-dumpslow_COMPONENT COMPONENT Client)
IF(WIN32) IF(WIN32)
# On Windows, some .sh and some .pl.in files are configured # On Windows, some .sh and some .pl.in files are configured
@@ -314,7 +315,6 @@ ELSE()
mariadb-fix-extensions mariadb-fix-extensions
mariadbd-multi mariadbd-multi
mariadbd-safe mariadbd-safe
mariadb-dumpslow
${SYSTEMD_SCRIPTS} ${SYSTEMD_SCRIPTS}
) )
ENDIF() ENDIF()

2
sql/CMakeLists.txt
View File

@@ -367,7 +367,7 @@ ADD_CUSTOM_COMMAND(
DEPENDS gen_lex_hash DEPENDS gen_lex_hash
) )
MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc COMPONENT Server) MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc)
SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
TARGET_LINK_LIBRARIES(mariadb-tzinfo-to-sql mysys mysys_ssl) TARGET_LINK_LIBRARIES(mariadb-tzinfo-to-sql mysys mysys_ssl)