diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
| commit | f740d23ce6574bf57449aa48b22d6345f35ad2c0 (patch) | |
| tree | 85eb18f1464b3dc76e571354401a2072cb8c8ba0 /man | |
| parent | e21c15a7e626b5c01d9770d82aaed56053c7baef (diff) | |
| parent | 97e0c260dc8273f809915505f8dfdccd948b4b99 (diff) | |
| download | mariadb-git-f740d23ce6574bf57449aa48b22d6345f35ad2c0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'man')
| -rw-r--r-- | man/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | man/my_safe_process.1 | 16 | ||||
| -rw-r--r-- | man/tokuft_logdump.1 | 16 |
3 files changed, 34 insertions, 2 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index f24c5c95d69..f5899577a47 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -26,7 +26,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 wsrep_sst_xtrabackup-v2.1 wsrep_sst_xtrabackup.1 - galera_recovery.1 galera_new_cluster.1) + galera_recovery.1 galera_new_cluster.1 tokuft_logdump.1) SET(MAN8_SERVER mysqld.8) SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 @@ -34,7 +34,7 @@ SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 mysql_plugin.1) SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1) + mysqltest_embedded.1 mysql_client_test_embedded.1 my_safe_process.1) INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) diff --git a/man/my_safe_process.1 b/man/my_safe_process.1 new file mode 100644 index 00000000000..fac8ed69fc8 --- /dev/null +++ b/man/my_safe_process.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBMY_SAFE_PROCESS\FR" "1" "29 March 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +my_safe_process \- Utility program that encapsulates process creation, monitoring and bulletproof process cleanup +.SH DESCRIPTION +Use: safe_process [options to safe_process] -- progname arg1 \.\.\. argn\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/tokuft_logdump.1 b/man/tokuft_logdump.1 new file mode 100644 index 00000000000..f6cf08080f7 --- /dev/null +++ b/man/tokuft_logdump.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBTOKUFT_LOGPRINT\FR" "1" "27 March 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +tokuft_logprint \- Dump the log from stdin to stdout +.SH DESCRIPTION +Use: Dump the log from stdin to stdout\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ |