From f6c5b57eb300c81755f53bbac8af88e115a9a4bb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 22 Dec 2022 19:38:54 +0100 Subject: [PATCH] man pages: mariadb* are primary pages, mysql* are generated --- .gitignore | 66 +++++++++---------- man/CMakeLists.txt | 22 +++---- man/{mysqlaccess.1 => mariadb-access.1} | 0 man/{mysqladmin.1 => mariadb-admin.1} | 0 man/{mariabackup.1 => mariadb-backup.1} | 0 man/{mysqlbinlog.1 => mariadb-binlog.1} | 0 man/{mysqlcheck.1 => mariadb-check.1} | 0 man/mariadb-client-test-embedded.1 | 1 + ...ql_client_test.1 => mariadb-client-test.1} | 0 ...ormat.1 => mariadb-convert-table-format.1} | 0 man/{mysqldump.1 => mariadb-dump.1} | 0 man/{mysqldumpslow.1 => mariadb-dumpslow.1} | 0 man/mariadb-embedded.1 | 1 + ...{mysql_find_rows.1 => mariadb-find-rows.1} | 0 ..._extensions.1 => mariadb-fix-extensions.1} | 0 man/{mysqlhotcopy.1 => mariadb-hotcopy.1} | 0 man/{mysqlimport.1 => mariadb-import.1} | 0 ...ysql_install_db.1 => mariadb-install-db.1} | 0 man/{mysql_ldb.1 => mariadb-ldb.1} | 0 man/{mysql_plugin.1 => mariadb-plugin.1} | 0 ...lation.1 => mariadb-secure-installation.1} | 0 ...etpermission.1 => mariadb-setpermission.1} | 0 man/{mysqlshow.1 => mariadb-show.1} | 0 man/{mysqlslap.1 => mariadb-slap.1} | 0 man/mariadb-test-embedded.1 | 1 + man/{mysqltest.1 => mariadb-test.1} | 0 ...zinfo_to_sql.1 => mariadb-tzinfo-to-sql.1} | 0 man/{mysql_upgrade.1 => mariadb-upgrade.1} | 0 man/{mysql_waitpid.1 => mariadb-waitpid.1} | 0 man/{mysql.1 => mariadb.1} | 0 man/{mysql_config.1 => mariadb_config.1} | 0 man/{mysqld_multi.1 => mariadbd-multi.1} | 0 ...d_safe_helper.1 => mariadbd-safe-helper.1} | 0 man/{mysqld_safe.1 => mariadbd-safe.1} | 0 man/{mysqld.8 => mariadbd.8} | 0 man/mysql_client_test_embedded.1 | 1 - man/mysql_embedded.1 | 1 - man/mysqltest_embedded.1 | 1 - 38 files changed, 47 insertions(+), 47 deletions(-) rename man/{mysqlaccess.1 => mariadb-access.1} (100%) rename man/{mysqladmin.1 => mariadb-admin.1} (100%) rename man/{mariabackup.1 => mariadb-backup.1} (100%) rename man/{mysqlbinlog.1 => mariadb-binlog.1} (100%) rename man/{mysqlcheck.1 => mariadb-check.1} (100%) create mode 100644 man/mariadb-client-test-embedded.1 rename man/{mysql_client_test.1 => mariadb-client-test.1} (100%) rename man/{mysql_convert_table_format.1 => mariadb-convert-table-format.1} (100%) rename man/{mysqldump.1 => mariadb-dump.1} (100%) rename man/{mysqldumpslow.1 => mariadb-dumpslow.1} (100%) create mode 100644 man/mariadb-embedded.1 rename man/{mysql_find_rows.1 => mariadb-find-rows.1} (100%) rename man/{mysql_fix_extensions.1 => mariadb-fix-extensions.1} (100%) rename man/{mysqlhotcopy.1 => mariadb-hotcopy.1} (100%) rename man/{mysqlimport.1 => mariadb-import.1} (100%) rename man/{mysql_install_db.1 => mariadb-install-db.1} (100%) rename man/{mysql_ldb.1 => mariadb-ldb.1} (100%) rename man/{mysql_plugin.1 => mariadb-plugin.1} (100%) rename man/{mysql_secure_installation.1 => mariadb-secure-installation.1} (100%) rename man/{mysql_setpermission.1 => mariadb-setpermission.1} (100%) rename man/{mysqlshow.1 => mariadb-show.1} (100%) rename man/{mysqlslap.1 => mariadb-slap.1} (100%) create mode 100644 man/mariadb-test-embedded.1 rename man/{mysqltest.1 => mariadb-test.1} (100%) rename man/{mysql_tzinfo_to_sql.1 => mariadb-tzinfo-to-sql.1} (100%) rename man/{mysql_upgrade.1 => mariadb-upgrade.1} (100%) rename man/{mysql_waitpid.1 => mariadb-waitpid.1} (100%) rename man/{mysql.1 => mariadb.1} (100%) rename man/{mysql_config.1 => mariadb_config.1} (100%) rename man/{mysqld_multi.1 => mariadbd-multi.1} (100%) rename man/{mysqld_safe_helper.1 => mariadbd-safe-helper.1} (100%) rename man/{mysqld_safe.1 => mariadbd-safe.1} (100%) rename man/{mysqld.8 => mariadbd.8} (100%) delete mode 100644 man/mysql_client_test_embedded.1 delete mode 100644 man/mysql_embedded.1 delete mode 100644 man/mysqltest_embedded.1 diff --git a/.gitignore b/.gitignore index 2fb3857120c..10a17f92a89 100644 --- a/.gitignore +++ b/.gitignore @@ -569,39 +569,39 @@ extra/mariadb-waitpid libmysqld/examples/mariadb-client-test-embedded libmysqld/examples/mariadb-embedded libmysqld/examples/mariadb-test-embedded -man/mariadb.1 -man/mariadb-access.1 -man/mariadb-admin.1 -man/mariadb-backup.1 -man/mariadb-binlog.1 -man/mariadb-check.1 -man/mariadb-client-test.1 -man/mariadb-client-test-embedded.1 -man/mariadb_config.1 -man/mariadb-convert-table-format.1 -man/mariadbd.8 -man/mariadbd-multi.1 -man/mariadbd-safe.1 -man/mariadbd-safe-helper.1 -man/mariadb-dump.1 -man/mariadb-dumpslow.1 -man/mariadb-embedded.1 -man/mariadb-find-rows.1 -man/mariadb-fix-extensions.1 -man/mariadb-hotcopy.1 -man/mariadb-import.1 -man/mariadb-install-db.1 -man/mariadb-ldb.1 -man/mariadb-plugin.1 -man/mariadb-secure-installation.1 -man/mariadb-setpermission.1 -man/mariadb-show.1 -man/mariadb-slap.1 -man/mariadb-test.1 -man/mariadb-test-embedded.1 -man/mariadb-tzinfo-to-sql.1 -man/mariadb-upgrade.1 -man/mariadb-waitpid.1 +man/mariabackup.1 +man/mysql.1 +man/mysql_client_test.1 +man/mysql_client_test_embedded.1 +man/mysql_config.1 +man/mysql_convert_table_format.1 +man/mysql_embedded.1 +man/mysql_find_rows.1 +man/mysql_fix_extensions.1 +man/mysql_install_db.1 +man/mysql_ldb.1 +man/mysql_plugin.1 +man/mysql_secure_installation.1 +man/mysql_setpermission.1 +man/mysql_tzinfo_to_sql.1 +man/mysql_upgrade.1 +man/mysql_waitpid.1 +man/mysqlaccess.1 +man/mysqladmin.1 +man/mysqlbinlog.1 +man/mysqlcheck.1 +man/mysqld.8 +man/mysqld_multi.1 +man/mysqld_safe.1 +man/mysqld_safe_helper.1 +man/mysqldump.1 +man/mysqldumpslow.1 +man/mysqlhotcopy.1 +man/mysqlimport.1 +man/mysqlshow.1 +man/mysqlslap.1 +man/mysqltest.1 +man/mysqltest_embedded.1 scripts/mariadb-access scripts/mariadb-convert-table-format scripts/mariadbd-multi diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index e6d7ab32e88..e1ef4877b2f 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -53,11 +53,11 @@ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPage INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) macro(MARIADB_SYMLINK_MANPAGE) - list(LENGTH MARIADB_SYMLINK_TOS _len) + list(LENGTH MARIADB_SYMLINK_FROMS _len) math(EXPR _listlen "${_len}-1") foreach(_index RANGE ${_listlen}) - list(GET MARIADB_SYMLINK_TOS ${_index} _name) + list(GET MARIADB_SYMLINK_FROMS ${_index} _name) set(_manname "${_name}") list(FIND MAN1_SERVER ${_manname}.1 _iman1server) @@ -67,31 +67,31 @@ macro(MARIADB_SYMLINK_MANPAGE) list(FIND MAN1_TEST ${_manname}.1 _iman1test) if (${_iman1client} GREATER -1) - MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesClient) + MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Client) endif() if (${_iman1devel} GREATER -1) - MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesDevelopment) + MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Development) endif() if (${_iman1test} GREATER -1) - MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesTest) + MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Test) endif() if (WITHOUT_SERVER) continue() endif() if (${_iman1server} GREATER -1) - MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesServer) + MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Server) endif() if (${_iman8server} GREATER -1) - MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 "man8" ManPagesServer) + MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 Server) endif() endforeach(_index) endmacro(MARIADB_SYMLINK_MANPAGE) -macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp) - LIST(GET MARIADB_SYMLINK_FROMS ${index} _mariadbname) +macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr comp) + LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname) SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}") - FILE(WRITE ${dest} ".so ${dir}/${mysqlname}.${mannr}") - INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp}) + FILE(WRITE ${dest} ".so man${mannr}/${mysqlname}.${mannr}") + INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/man${mannr} COMPONENT ManPages${comp}) endmacro(MARIADB_SYMLINK_MANPAGE_CREATE) MARIADB_SYMLINK_MANPAGE() diff --git a/man/mysqlaccess.1 b/man/mariadb-access.1 similarity index 100% rename from man/mysqlaccess.1 rename to man/mariadb-access.1 diff --git a/man/mysqladmin.1 b/man/mariadb-admin.1 similarity index 100% rename from man/mysqladmin.1 rename to man/mariadb-admin.1 diff --git a/man/mariabackup.1 b/man/mariadb-backup.1 similarity index 100% rename from man/mariabackup.1 rename to man/mariadb-backup.1 diff --git a/man/mysqlbinlog.1 b/man/mariadb-binlog.1 similarity index 100% rename from man/mysqlbinlog.1 rename to man/mariadb-binlog.1 diff --git a/man/mysqlcheck.1 b/man/mariadb-check.1 similarity index 100% rename from man/mysqlcheck.1 rename to man/mariadb-check.1 diff --git a/man/mariadb-client-test-embedded.1 b/man/mariadb-client-test-embedded.1 new file mode 100644 index 00000000000..327a06c5af9 --- /dev/null +++ b/man/mariadb-client-test-embedded.1 @@ -0,0 +1 @@ +.so man1/mariadb-client-test.1 diff --git a/man/mysql_client_test.1 b/man/mariadb-client-test.1 similarity index 100% rename from man/mysql_client_test.1 rename to man/mariadb-client-test.1 diff --git a/man/mysql_convert_table_format.1 b/man/mariadb-convert-table-format.1 similarity index 100% rename from man/mysql_convert_table_format.1 rename to man/mariadb-convert-table-format.1 diff --git a/man/mysqldump.1 b/man/mariadb-dump.1 similarity index 100% rename from man/mysqldump.1 rename to man/mariadb-dump.1 diff --git a/man/mysqldumpslow.1 b/man/mariadb-dumpslow.1 similarity index 100% rename from man/mysqldumpslow.1 rename to man/mariadb-dumpslow.1 diff --git a/man/mariadb-embedded.1 b/man/mariadb-embedded.1 new file mode 100644 index 00000000000..78fc18b313f --- /dev/null +++ b/man/mariadb-embedded.1 @@ -0,0 +1 @@ +.so man1/mariadb.1 diff --git a/man/mysql_find_rows.1 b/man/mariadb-find-rows.1 similarity index 100% rename from man/mysql_find_rows.1 rename to man/mariadb-find-rows.1 diff --git a/man/mysql_fix_extensions.1 b/man/mariadb-fix-extensions.1 similarity index 100% rename from man/mysql_fix_extensions.1 rename to man/mariadb-fix-extensions.1 diff --git a/man/mysqlhotcopy.1 b/man/mariadb-hotcopy.1 similarity index 100% rename from man/mysqlhotcopy.1 rename to man/mariadb-hotcopy.1 diff --git a/man/mysqlimport.1 b/man/mariadb-import.1 similarity index 100% rename from man/mysqlimport.1 rename to man/mariadb-import.1 diff --git a/man/mysql_install_db.1 b/man/mariadb-install-db.1 similarity index 100% rename from man/mysql_install_db.1 rename to man/mariadb-install-db.1 diff --git a/man/mysql_ldb.1 b/man/mariadb-ldb.1 similarity index 100% rename from man/mysql_ldb.1 rename to man/mariadb-ldb.1 diff --git a/man/mysql_plugin.1 b/man/mariadb-plugin.1 similarity index 100% rename from man/mysql_plugin.1 rename to man/mariadb-plugin.1 diff --git a/man/mysql_secure_installation.1 b/man/mariadb-secure-installation.1 similarity index 100% rename from man/mysql_secure_installation.1 rename to man/mariadb-secure-installation.1 diff --git a/man/mysql_setpermission.1 b/man/mariadb-setpermission.1 similarity index 100% rename from man/mysql_setpermission.1 rename to man/mariadb-setpermission.1 diff --git a/man/mysqlshow.1 b/man/mariadb-show.1 similarity index 100% rename from man/mysqlshow.1 rename to man/mariadb-show.1 diff --git a/man/mysqlslap.1 b/man/mariadb-slap.1 similarity index 100% rename from man/mysqlslap.1 rename to man/mariadb-slap.1 diff --git a/man/mariadb-test-embedded.1 b/man/mariadb-test-embedded.1 new file mode 100644 index 00000000000..65bf13872da --- /dev/null +++ b/man/mariadb-test-embedded.1 @@ -0,0 +1 @@ +.so man1/mariadb-test.1 diff --git a/man/mysqltest.1 b/man/mariadb-test.1 similarity index 100% rename from man/mysqltest.1 rename to man/mariadb-test.1 diff --git a/man/mysql_tzinfo_to_sql.1 b/man/mariadb-tzinfo-to-sql.1 similarity index 100% rename from man/mysql_tzinfo_to_sql.1 rename to man/mariadb-tzinfo-to-sql.1 diff --git a/man/mysql_upgrade.1 b/man/mariadb-upgrade.1 similarity index 100% rename from man/mysql_upgrade.1 rename to man/mariadb-upgrade.1 diff --git a/man/mysql_waitpid.1 b/man/mariadb-waitpid.1 similarity index 100% rename from man/mysql_waitpid.1 rename to man/mariadb-waitpid.1 diff --git a/man/mysql.1 b/man/mariadb.1 similarity index 100% rename from man/mysql.1 rename to man/mariadb.1 diff --git a/man/mysql_config.1 b/man/mariadb_config.1 similarity index 100% rename from man/mysql_config.1 rename to man/mariadb_config.1 diff --git a/man/mysqld_multi.1 b/man/mariadbd-multi.1 similarity index 100% rename from man/mysqld_multi.1 rename to man/mariadbd-multi.1 diff --git a/man/mysqld_safe_helper.1 b/man/mariadbd-safe-helper.1 similarity index 100% rename from man/mysqld_safe_helper.1 rename to man/mariadbd-safe-helper.1 diff --git a/man/mysqld_safe.1 b/man/mariadbd-safe.1 similarity index 100% rename from man/mysqld_safe.1 rename to man/mariadbd-safe.1 diff --git a/man/mysqld.8 b/man/mariadbd.8 similarity index 100% rename from man/mysqld.8 rename to man/mariadbd.8 diff --git a/man/mysql_client_test_embedded.1 b/man/mysql_client_test_embedded.1 deleted file mode 100644 index 41f528017b3..00000000000 --- a/man/mysql_client_test_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql_client_test.1 diff --git a/man/mysql_embedded.1 b/man/mysql_embedded.1 deleted file mode 100644 index 735c4e05ae0..00000000000 --- a/man/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/man/mysqltest_embedded.1 b/man/mysqltest_embedded.1 deleted file mode 100644 index a00489327b3..00000000000 --- a/man/mysqltest_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysqltest.1