Commit 248234f1 authored by tim@white.box's avatar tim@white.box
Browse files

Merge work:/home/bk/mysql-4.0 into white.box:/home/tim/my/4

parents df298ac6 af443612

man/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


man_MANS =	mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \

		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \

		perror.1 replace.1 safe_mysqld.1

		perror.1 replace.1 mysqld_safe.1



EXTRA_DIST =	$(man_MANS)

man/isamchk.1

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ mysqlshow (1), 
msql2mysql (1),

perror (1),

replace (1),

safe_mysqld (1),

mysqld_safe (1),

which1 (1),

zap (1),

.SH AUTHOR

man/isamlog.1

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ mysqlshow (1), 
msql2mysql (1),

perror (1),

replace (1),

safe_mysqld (1),

mysqld_safe (1),

which1 (1),

zap (1),

man/mysql.1

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ executable 
.I /depot/bin/mysqld

executable

.TP

.I /depot/bin/safe_mysqld

.I /depot/bin/mysqld_safe

executable shell script for starting mysqld safely

.TP

.I /site/var/mysql/data
@@ -135,7 +135,7 @@ mysqlshow (1), 
msql2mysql (1),

perror (1),

replace (1),

safe_mysqld (1),

mysqld_safe (1),

which1 (1),

zap (1),

.SH AUTHOR

man/mysql_zap.1

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ isn't given, ask user for confirmation for each process to kill. If signal isn't 
.BR -t 

is given the processes is only shown on stdout.

.SH "SEE ALSO" 

isamchk (1), isamlog (1), mysqlaccess (1), mysqladmin (1), mysqlbug (1), mysqld (1), mysqldump (1), mysqlshow (1), msql2mysql (1), perror (1), replace (1), safe_mysqld (1), which1 (1), zap (1),

isamchk (1), isamlog (1), mysqlaccess (1), mysqladmin (1), mysqlbug (1), mysqld (1), mysqldump (1), mysqlshow (1), msql2mysql (1), perror (1), replace (1), mysqld_safe (1), which1 (1), zap (1),

.SH AUTHOR 

Ver 1.0, distribution 3.23.29a Michael (Monty) Widenius (monty@tcx.se), TCX Datakonsult AB (http://www.tcx.se). This software comes with no warranty. Manual page by L. (Kill-9) Pedersen (kill-9@kill-9.dk), Mercurmedia Data Model Architect / system developer (http://www.mercurmedia.com) 

.\" end of man page 
 No newline at end of file