Skip to content

Commit 306e439

Browse files
vuvovavuvova
committed
MDEV-17592 Create MariaDB named commands/symlinks
post-merge fixes: * .gitignore * don't put the keyword COMPONENT into ${COMP} anymore * don't alias mytop, but do alias mysql_client_test * don't symlink manpages, use troff aliasing technique instead (symlinked manpages break rpm and out-of-source bintar builds) * move debian to use troff aliased manpages, fix typos in debian files, put aliases in the correct packages, add more aliases to match rpm/bintar packaging
1 parent 24503d5 commit 306e439

20 files changed

+122
-55
lines changed

‎.gitignore

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,3 +524,67 @@ compile_commands.json
524524
# Clion && other JetBrains ides
525525
.idea
526526

527+
client/mariadb
528+
client/mariadb-admin
529+
client/mariadb-binlog
530+
client/mariadb-check
531+
client/mariadb-dump
532+
client/mariadb-import
533+
client/mariadb-plugin
534+
client/mariadb-show
535+
client/mariadb-slap
536+
client/mariadb-test
537+
client/mariadb-upgrade
538+
extra/mariabackup/mariadb-backup
539+
extra/mariadb-waitpid
540+
extra/mariadbd-safe-helper
541+
libmysqld/examples/mariadb-client-test-embedded
542+
libmysqld/examples/mariadb-embedded
543+
libmysqld/examples/mariadb-test-embedded
544+
man/mariadb-access.1
545+
man/mariadb-admin.1
546+
man/mariadb-backup.1
547+
man/mariadb-binlog.1
548+
man/mariadb-check.1
549+
man/mariadb-client-test-embedded.1
550+
man/mariadb-client-test.1
551+
man/mariadb-convert-table-format.1
552+
man/mariadb-dump.1
553+
man/mariadb-dumpslow.1
554+
man/mariadb-embedded.1
555+
man/mariadb-find-rows.1
556+
man/mariadb-fix-extensions.1
557+
man/mariadb-hotcopy.1
558+
man/mariadb-import.1
559+
man/mariadb-install-db.1
560+
man/mariadb-ldb.1
561+
man/mariadb-plugin.1
562+
man/mariadb-secure-installation.1
563+
man/mariadb-setpermission.1
564+
man/mariadb-show.1
565+
man/mariadb-slap.1
566+
man/mariadb-test-embedded.1
567+
man/mariadb-test.1
568+
man/mariadb-tzinfo-to-sql.1
569+
man/mariadb-upgrade.1
570+
man/mariadb-waitpid.1
571+
man/mariadb.1
572+
man/mariadbd-multi.1
573+
man/mariadbd-safe-helper.1
574+
man/mariadbd-safe.1
575+
man/mariadbd.8
576+
scripts/mariadb-access
577+
scripts/mariadb-convert-table-format
578+
scripts/mariadb-dumpslow
579+
scripts/mariadb-find-rows
580+
scripts/mariadb-fix-extensions
581+
scripts/mariadb-hotcopy
582+
scripts/mariadb-install-db
583+
scripts/mariadb-secure-installation
584+
scripts/mariadb-setpermission
585+
scripts/mariadbd-multi
586+
scripts/mariadbd-safe
587+
sql/mariadb-tzinfo-to-sql
588+
sql/mariadbd
589+
storage/rocksdb/mariadb-ldb
590+
tests/mariadb-client-test

‎cmake/install_macros.cmake

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,13 @@ FUNCTION(INSTALL_SCRIPT)
101101
IF(NOT ARG_DESTINATION)
102102
SET(ARG_DESTINATION ${INSTALL_BINDIR})
103103
ENDIF()
104-
IF(ARG_COMPONENT)
105-
SET(COMP COMPONENT ${ARG_COMPONENT})
106-
ELSE()
107-
SET(COMP)
108-
ENDIF()
104+
SET(COMP ${ARG_COMPONENT})
109105

110106
IF (COMP MATCHES ${SKIP_COMPONENTS})
111107
RETURN()
112108
ENDIF()
113109

114-
INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} ${COMP})
110+
INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
115111
get_filename_component(dest "${script}" NAME)
116112
CREATE_MARIADB_SYMLINK(${dest} ${ARG_DESTINATION} ${COMP})
117113

‎cmake/mysql_add_executable.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
7070
SET(ARG_DESTINATION ${INSTALL_BINDIR})
7171
ENDIF()
7272
IF(ARG_COMPONENT)
73-
SET(COMP COMPONENT ${ARG_COMPONENT})
73+
SET(COMP ${ARG_COMPONENT})
7474
ELSEIF(MYSQL_INSTALL_COMPONENT)
75-
SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
75+
SET(COMP ${MYSQL_INSTALL_COMPONENT})
7676
ELSE()
77-
SET(COMP COMPONENT Client)
77+
SET(COMP Client)
7878
ENDIF()
7979
IF (COMP MATCHES ${SKIP_COMPONENTS})
8080
RETURN()
8181
ENDIF()
82-
MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
82+
MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
8383
ENDIF()
8484

8585
# create mariadb named symlink

‎cmake/symlinks.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ REGISTER_SYMLINK("mariabackup" "mariadb-backup")
1212
REGISTER_SYMLINK("mysqlbinlog" "mariadb-binlog")
1313
REGISTER_SYMLINK("mysqlcheck" "mariadb-check")
1414
REGISTER_SYMLINK("mysql_client_test_embedded" "mariadb-client-test-embedded")
15+
REGISTER_SYMLINK("mysql_client_test" "mariadb-client-test")
1516
REGISTER_SYMLINK("mariadb_config" "mariadb-config")
1617
REGISTER_SYMLINK("mysql_convert_table_format" "mariadb-convert-table-format")
1718
REGISTER_SYMLINK("mysqldump" "mariadb-dump")
@@ -30,7 +31,6 @@ REGISTER_SYMLINK("mysqlshow" "mariadb-show")
3031
REGISTER_SYMLINK("mysqlslap" "mariadb-slap")
3132
REGISTER_SYMLINK("mysqltest" "mariadb-test")
3233
REGISTER_SYMLINK("mysqltest_embedded" "mariadb-test-embedded")
33-
REGISTER_SYMLINK("mytop" "mariadb-top")
3434
REGISTER_SYMLINK("mysql_tzinfo_to_sql" "mariadb-tzinfo-to-sql")
3535
REGISTER_SYMLINK("mysql_upgrade" "mariadb-upgrade")
3636
REGISTER_SYMLINK("mysql_upgrade_service" "mariadb-upgrade-service")
@@ -59,7 +59,7 @@ endmacro(CREATE_MARIADB_SYMLINK)
5959
macro(CREATE_MARIADB_SYMLINK_IN_DIR src dest dir comp)
6060
if(UNIX)
6161
add_custom_target(
62-
symlink_${dest}_${comp} ALL
62+
SYM_${dest} ALL
6363
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dest}
6464
)
6565

‎debian/mariadb-backup.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
usr/bin/mariabackup
22
usr/bin/mbstream
3+
usr/share/man/man1/mariabackup.1
4+
usr/share/man/man1/mariadb-backup.1

‎debian/mariadb-backup.links

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/bin/mariabackup usr/bin/mariadb-backup

‎debian/mariadb-client-10.4.install

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,14 @@ usr/share/man/man1/mysqldumpslow.1
2020
usr/share/man/man1/mysqlimport.1
2121
usr/share/man/man1/mysqlshow.1
2222
usr/share/man/man1/mysqlslap.1
23+
usr/share/man/man1/mariadb-access.1
24+
usr/share/man/man1/mariadb-admin.1
25+
usr/share/man/man1/mariadb-binlog.1
26+
usr/share/man/man1/mariadb-dump.1
27+
usr/share/man/man1/mariadb-dumpslow.1
28+
usr/share/man/man1/mariadb-find-rows.1
29+
usr/share/man/man1/mariadb-fix-extensions.1
30+
usr/share/man/man1/mariadb-import.1
31+
usr/share/man/man1/mariadb-plugin.1
32+
usr/share/man/man1/mariadb-slap.1
33+
usr/share/man/man1/mariadb-waitpid.1

‎debian/mariadb-client-10.4.links

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
usr/bin/mysql_find_rows usr/bin/mariadb-find-rows
2-
usr/bin/mysql_fix_extensions usr/bin/mariadb-fix-extenstions
2+
usr/bin/mysql_fix_extensions usr/bin/mariadb-fix-extensions
33
usr/bin/mysql_plugin usr/bin/mariadb-plugin
44
usr/bin/mysql_waitpid usr/bin/mariadb-waitpid
55
usr/bin/mysqlaccess usr/bin/mariadb-access
66
usr/bin/mysqladmin usr/bin/mariadb-admin
7-
usr/bin/mysqlanalyze usr/bin/mariadb-analyze
87
usr/bin/mysqlbinlog usr/bin/mariadb-binlog
98
usr/bin/mysqlcheck usr/bin/mariadb-analyze
109
usr/bin/mysqlcheck usr/bin/mariadb-optimize
@@ -13,32 +12,14 @@ usr/bin/mysqlcheck usr/bin/mysqlanalyze
1312
usr/bin/mysqlcheck usr/bin/mysqloptimize
1413
usr/bin/mysqlcheck usr/bin/mysqlrepair
1514
usr/bin/mysqldump usr/bin/mariadb-dump
16-
usr/bin/mysqldumpslow usr/bin/mariadb-dump-slow
15+
usr/bin/mysqldumpslow usr/bin/mariadb-dumpslow
1716
usr/bin/mysqlimport usr/bin/mariadb-import
18-
usr/bin/mysqloptimize usr/bin/mariadb-optimize
19-
usr/bin/mysqlrepair usr/bin/mariadb-repair
2017
usr/bin/mysqlreport usr/bin/mariadb-report
2118
usr/bin/mysqlslap usr/bin/mariadb-slap
22-
usr/bin/mysqltest usr/bin/mariadb-test
23-
usr/share/man/man1/mysql_find_rows.1.gz usr/share/man/man1/mariadb-find-rows.1.gz
24-
usr/share/man/man1/mysql_fix_extensions.1.gz usr/share/man/man1/mariadb-fix-extensions.1.gz
25-
usr/share/man/man1/mysql_plugin.1.gz usr/share/man/man1/mariadb-plugin.1.gz
26-
usr/share/man/man1/mysql_waitpid.1.gz usr/share/man/man1/mariadb-waitpid.1.gz
27-
usr/share/man/man1/mysqlaccess.1.gz usr/share/man/man1/mariadb-access.1.gz
28-
usr/share/man/man1/mysqladmin.1.gz usr/share/man/man1/mariadb-admin.1.gz
29-
usr/share/man/man1/mysqlanalyze.1.gz usr/share/man/man1/mariadb-analyze.1.gz
30-
usr/share/man/man1/mysqlbinlog.1.gz usr/share/man/man1/mariadb-binlog.1.gz
3119
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-analyze.1.gz
3220
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-optimize.1.gz
3321
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-repair.1.gz
3422
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
3523
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz
3624
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
37-
usr/share/man/man1/mysqldump.1.gz usr/share/man/man1/mariadb-dump.1.gz
38-
usr/share/man/man1/mysqldumpslow.1.gz usr/share/man/man1/mariadb-dump-slow.1.gz
39-
usr/share/man/man1/mysqlimport.1.gz usr/share/man/man1/mariadb-import.1.gz
40-
usr/share/man/man1/mysqloptimize.1.gz usr/share/man/man1/mariadb-optimize.1.gz
41-
usr/share/man/man1/mysqlrepair.1.gz usr/share/man/man1/mariadb-repair.1.gz
4225
usr/share/man/man1/mysqlreport.1.gz usr/share/man/man1/mariadb-report.1.gz
43-
usr/share/man/man1/mysqlslap.1.gz usr/share/man/man1/mariadb-slap.1.gz
44-
usr/share/man/man1/mysqltest.1.gz usr/share/man/man1/mariadb-test.1.gz

‎debian/mariadb-client-core-10.4.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ usr/bin/mysql
22
usr/bin/mysqlcheck
33
usr/share/man/man1/mysql.1
44
usr/share/man/man1/mysqlcheck.1
5+
usr/share/man/man1/mariadb.1
6+
usr/share/man/man1/mariadb-check.1

‎debian/mariadb-client-core-10.4.links

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
usr/bin/mysql usr/bin/mariadb
22
usr/bin/mysqlcheck usr/bin/mariadb-check
3-
usr/share/man/man1/mysql.1.gz usr/share/man/man1/mariadb.1.gz
4-
usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-check.1.gz

‎debian/mariadb-plugin-rocksdb.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
22
usr/bin/myrocks_hotbackup
33
usr/bin/mysql_ldb
4+
usr/share/man/man1/mariadb-ldb.1
5+
usr/share/man/man1/mysql_ldb.1
46
usr/bin/sst_dump
57
usr/lib/mysql/plugin/ha_rocksdb.so

‎debian/mariadb-plugin-rocksdb.links

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/bin/mysql_ldb usr/bin/mariadb-ldb

‎debian/mariadb-server-10.4.install

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,16 @@ usr/share/man/man1/aria_pack.1
6666
usr/share/man/man1/aria_read_log.1
6767
usr/share/man/man1/galera_new_cluster.1
6868
usr/share/man/man1/galera_recovery.1
69+
usr/share/man/man1/mariadb-convert-table-format.1
70+
usr/share/man/man1/mariadb-hotcopy.1
71+
usr/share/man/man1/mariadb-secure-installation.1
6972
usr/share/man/man1/mariadb-service-convert.1
73+
usr/share/man/man1/mariadb-setpermission.1
74+
usr/share/man/man1/mariadb-show.1
75+
usr/share/man/man1/mariadb-tzinfo-to-sql.1
76+
usr/share/man/man1/mariadbd-multi.1
77+
usr/share/man/man1/mariadbd-safe-helper.1
78+
usr/share/man/man1/mariadbd-safe.1
7079
usr/share/man/man1/msql2mysql.1
7180
usr/share/man/man1/my_print_defaults.1
7281
usr/share/man/man1/myisam_ftdump.1

‎debian/mariadb-server-10.4.links

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@ usr/bin/mysql_convert_table_format usr/bin/mariadb-convert-table-format
22
usr/bin/mysql_secure_installation usr/bin/mariadb-secure-installation
33
usr/bin/mysql_setpermission usr/bin/mariadb-setpermission
44
usr/bin/mysql_tzinfo_to_sql usr/bin/mariadb-tzinfo-to-sql
5-
usr/bin/mysqld_multi usr/bin/mariadb-multi
6-
usr/bin/mysqld_safe usr/bin/mariadb-safe
7-
usr/bin/mysqld_safe_helper usr/bin/mariadb-safe-helper
5+
usr/bin/mysqld_multi usr/bin/mariadbd-multi
6+
usr/bin/mysqld_safe usr/bin/mariadbd-safe
7+
usr/bin/mysqld_safe_helper usr/bin/mariadbd-safe-helper
88
usr/bin/mysqlhotcopy usr/bin/mariadb-hotcopy
99
usr/bin/mysqlshow usr/bin/mariadb-show
10-
usr/share/man/man1/mysql_convert_table_format.1.gz usr/share/man/man1/mariadb-convert-table-format.1.gz
11-
usr/share/man/man1/mysql_secure_installation.1.gz usr/share/man/man1/mariadb-secure-installation.1.gz
12-
usr/share/man/man1/mysql_setpermission.1.gz usr/share/man/man1/mariadb-setpermission.1.gz
13-
usr/share/man/man1/mysql_tzinfo_to_sql.1.gz usr/share/man/man1/mariadb-tzinfo-to-sql.1.gz
14-
usr/share/man/man1/mysqld_multi.1.gz usr/share/man/man1/mariadb-multi.1.gz
15-
usr/share/man/man1/mysqld_safe.1.gz usr/share/man/man1/mariadb-safe.1.gz
16-
usr/share/man/man1/mysqld_safe_helper.1.gz usr/share/man/man1/mariadb-safe-helper.1.gz
17-
usr/share/man/man1/mysqlhotcopy.1.gz usr/share/man/man1/mariadb-hotcopy.1.gz
18-
usr/share/man/man1/mysqlshow.1.gz usr/share/man/man1/mariadb-show.1.gz

‎debian/mariadb-server-core-10.4.install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ usr/share/man/man1/innochecksum.1
66
usr/share/man/man1/mysql_install_db.1
77
usr/share/man/man1/mysql_upgrade.1
88
usr/share/man/man8/mysqld.8
9+
usr/share/man/man1/mariadb-install-db.1
10+
usr/share/man/man1/mariadb-upgrade.1
11+
usr/share/man/man8/mariadbd.8
912
usr/share/mysql/charsets
1013
usr/share/mysql/czech
1114
usr/share/mysql/danish

‎debian/mariadb-server-core-10.4.links

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
usr/bin/mysql_install_db usr/bin/mariadb-install-db
22
usr/bin/mysql_upgrade usr/bin/mariadb-upgrade
3-
usr/share/man/man1/mysql_install_db.1.gz usr/share/man/man1/mariadb-install-db.1.gz
4-
usr/share/man/man1/mysql_upgrade.1.gz usr/share/man/man1/mariadb-upgrade-db.1.gz
3+
usr/sbin/mysqld usr/sbin/mariadbd

‎debian/mariadb-test.install

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ usr/share/man/man1/mysql_client_test.1
2323
usr/share/man/man1/mysql_client_test_embedded.1
2424
usr/share/man/man1/mysqltest.1
2525
usr/share/man/man1/mysqltest_embedded.1
26+
usr/share/man/man1/mariadb-client-test-embedded.1
27+
usr/share/man/man1/mariadb-client-test.1
28+
usr/share/man/man1/mariadb-test-embedded.1
29+
usr/share/man/man1/mariadb-test.1
2630
usr/share/mysql/mysql-test/README
2731
usr/share/mysql/mysql-test/README-gcov
2832
usr/share/mysql/mysql-test/README.stress

‎debian/mariadb-test.links

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
22
usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
3+
usr/bin/mysql_client_test_embedded usr/bin/mariadb-client-test-embedded
4+
usr/bin/mysqltest_embedded usr/bin/mariadb-test-embedded
5+
usr/bin/mysql_client_test usr/bin/mariadb-client-test
6+
usr/bin/mysqltest usr/bin/mariadb-test

‎man/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ macro(MARIADB_SYMLINK_MANPAGE)
7777
endmacro(MARIADB_SYMLINK_MANPAGE)
7878

7979
macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp)
80-
list(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
81-
set(symlinkname "${_mariadbname}.${mannr}")
82-
CREATE_MARIADB_SYMLINK_IN_DIR(${mysqlname}.${mannr} ${symlinkname} ${INSTALL_MANDIR}/${dir} ${comp})
80+
LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
81+
SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}")
82+
FILE(WRITE ${dest} ".so ${mysqlname}.${mannr}")
83+
INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp})
8384
endmacro(MARIADB_SYMLINK_MANPAGE_CREATE)
8485

8586
MARIADB_SYMLINK_MANPAGE()

‎tests/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(BEFORE
2222
${CMAKE_BINARY_DIR}/libmariadb/include
2323
${CMAKE_SOURCE_DIR}/libmariadb/include)
2424

25-
ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
25+
MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.c COMPONENT Test)
2626
SET(CLIENT_LIB mariadbclient mysys)
2727

2828
TARGET_LINK_LIBRARIES(mysql_client_test ${CLIENT_LIB})
@@ -34,8 +34,6 @@ IF(WITH_UNIT_TESTS)
3434
ADD_DEPENDENCIES(bug25714 GenError ${CLIENT_LIB})
3535
ENDIF()
3636

37-
INSTALL(TARGETS mysql_client_test DESTINATION ${INSTALL_BINDIR} COMPONENT Test)
38-
3937
CHECK_INCLUDE_FILE(event.h HAVE_EVENT_H)
4038
FIND_LIBRARY(EVENT_LIBRARY event)
4139
MARK_AS_ADVANCED(EVENT_LIBRARY)

0 commit comments

Comments
 (0)