Commit fe116472 authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

parents 81aa2a35 45feb666
Loading
Loading
Loading
Loading

NEW-RPMS/.cvsignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
MySQL-*.rpm
+4 −0
Original line number Diff line number Diff line
@@ -2272,10 +2272,14 @@ AC_ARG_WITH(man,
if test "$with_man" = "yes"
then
  man_dirs="man"
  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
  man1_files=`echo $man1_files`
else
  man_dirs=""
  man1_files=""
fi
AC_SUBST(man_dirs)
AC_SUBST(man1_files)

# Shall we build the bench code?
AC_ARG_WITH(bench,
+2 −24
Original line number Diff line number Diff line
@@ -17,30 +17,8 @@

## Process this file with automake to create Makefile.in

man_MANS =	mysql.1 mysql_zap.1 mysqlaccess.1 \
		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1

EXTRA_DIST =	mysql.1.in mysql_zap.1.in \
		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
		mysqld_safe.1.in mysql_fix_privilege_tables.1.in

CLEANFILES = $(man_MANS)

SUFFIXES = .in

.in:
	@RM@ -f $@ $@-t
	@SED@ \
	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
	  -e 's!@''sysconfdir''@!@sysconfdir@!' \
	  -e 's!@''bindir''@!$(bindir)!g' \
	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
	$< > $@-t
	@MV@ $@-t $@
man1_MANS =   @man1_files@
EXTRA_DIST =  $(man1_MANS)

# Don't update the files from bitkeeper
%::SCCS/s.%

man/mysql.1.in

deleted100644 → 0
+0 −160
Original line number Diff line number Diff line
.TH mysql 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
.SH NAME
mysql \- text-based client for mysqld, a SQL-based relational database daemon
.SH USAGE
mysql [OPTIONS] [Database]
.SH SYNOPSIS
.B mysql
.RB [ \-B | \-\-batch ]
.RB [ \-# | \-\-debug=
.IR logfile ]
.RB [ \-T | \-\-debug-info ]
.RB [ \-e | \-\-exec=
.IR command ]
.RB [ \-f | \-\-force ]
.RB [ \-? | \-\-help ]
.RB [ \-h | \-\-host=
.IR hostname ]
.RB [ \-n | \-\-unbuffered ]
.RB [ \-p[pwd] ]
.RI [ \-\-password=[pwd] ]
.RB [ \-P | \-\-port=
.IR pnum ]
.RB [ \-q | \-\-quick ]
.RB [ \-r | \-\-raw ]
.RB [ \-s | \-\-silent ]
.RB [ \-S | \-\-socket=
.IR snum ]
.RB [ \-u | \-\-user=
.IR uname ]
.RB [ \-v | \-\-verbose ]
.RB [ \-V | \-\-version ]
.RB [ \-w | \-\-wait ]
.SH DESCRIPTION
The
.IR mysql
program provides a curses-based interface to the SQL-based database
server daemon,
.IR mysqld (1).
Full fuller documentation, refer to the HTML documents installed with
the package.
.SH OPTIONS
.TP
.BR \-B | \-\-batch
Print results with a tab as separator,
each row on a new line.
.TP
\fB\-#\fP|\fB\-\-debug=\fP\fIlogfile\fP
Employ the specified debug log.
.TP
.BR \-T | \-\-debug-info
Print debug information upon exiting.
.TP
\fB\-e | \-\-exec=\fP\fPcommand\fP
Execute the specified command and quit
.BR ( \-\-batch
is implicit).
.TP
.BR \-f | \-\-force
Continue even if the face of a SQL error.
.TP
.BR \-? | \-\-help
Display a help message and exit.
.TP
\fB\-h\fP|\fP\-\-host=\fP\fIhostname\fP
Connect to the specified host.
.TP
.BR \-n | \-\-unbuffered
Flush the buffer after each query.
.TP
\fB\-p\fP|\fB\-\-password\fP[\fB=\fP\fIpwd\fP]
Employ the specified password when connecting to the database server.
If a password is not supplied, it will be requested interactively.
.TP
\fB\-P\fR|\fB\-\-port=\fP\fIpnum\fP
Employ the specified port number for connecting to the database server.
.TP
.BR \-q | \-\-quick
Do not cache the result; print it row by row.
This may slow down the server if the output is suspended.
.TP
.BR \-r | \-\-raw
Write fields without conversion.
(used with
.BR \-\-batch ).
.TP
.BR \-s | \-\-silent
Silent mode: reduce the amount of output.
.TP
\fB\-S\fP|\fB\-\-socket=\fP\fIsnum\fP
Employ the specified socket file for connecting to the database server.
.TP
\fB\-u\fP|\fB\-\-user=\fP\fIuname\fP
Employ the specified user name for logging in to the server.
.TP
.BR \-v | \-\-verbose
Verbose mode: write more
Specifying this option
.I twice
produces a tabular output format.
.TP
.BR \-V | \-\-version
Print the
.I mysql
version number and exit.
.TP
.BR \-w | \-\-wait
Wait and retry if the database server connection is down.
.SH FILES
.TP 2.2i
.I /etc/my.cnf
MySQL configuration file
.TP
.I @bindir@/mysql
Client executable
.TP
.I @libexecdir@/mysqld
Server executable
.TP
.I @bindir@/mysqld_safe
executable shell script for starting mysqld safely
.TP
.I @localstatedir@
location of database files
.SH EXAMPLE
You can also read a backup dump file back into MySQL with: 
.TP
.BR mysql 
\fP\fIdatabase\fP 
.BR < 
backup-file.sql
.SH "SEE ALSO"
isamchk(1),
isamlog(1),
mysqlaccess(1),
mysqladmin(1),
mysqld(1),
mysqld_multi(1),
mysqld_safe(1),
mysqldump(1),
mysql_fix_privilege_tables(1),
mysqlshow(1),
mysql_zap(1),
perror(1),
replace(1)
.P
For more information please refer to the MySQL reference
manual, which may already be installed locally and which
is also available online at http://dev.mysql.com/doc/mysql/en
.SH BUGS
Please refer to http://bugs.mysql.com/ to report bugs.
.SH AUTHOR
Ver 6.3, distribution @MYSQL_NO_DASH_VERSION@
Michael (Monty) Widenius (monty@mysql.com),
MySQL AB (http://www.mysql.com/)
This software comes with no warranty.
Manual page by R. P. C. Rodgers,
Lister Hill National Center for Biomedical Communication,
U.S. National Library of Medicine
(rodgers@nlm.nih.gov).
.\" end of man page
+0 −40
Original line number Diff line number Diff line
.TH mysql 1 "17 March 2003" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
.SH NAME
mysql_fix_privilege_tables \- Fixes MySQL privilege tables.
.SH SYNOPSIS
mysql_fix_privilege_tables [mysql_root_password]
.SH DESCRIPTION
This scripts updates the mysql.user, mysql.db, mysql.host and the
mysql.func tables to MySQL 3.22.14 and above.

This is needed if you want to use the new GRANT functions,
CREATE AGGREGATE FUNCTION or want to use the more secure passwords in 3.23

If you get 'Access denied' errors, run the script again
and give the MySQL root user password as an argument.

.SH "SEE ALSO"
isamchk(1),
isamlog(1),
mysql(1),
mysqlaccess(1),
mysqladmin(1),
mysqld(1),
mysqld_multi(1),
mysqld_safe(1),
mysqldump(1),
mysqlshow(1),
mysql_zap(1),
perror(1),
replace(1)
.P
For more information please refer to the MySQL reference
manual, which may already be installed locally and which
is also available online at http://dev.mysql.com/doc/mysql/en
.SH BUGS
Please refer to http://bugs.mysql.com/ to report bugs.
.SH AUTHOR
This manpage was written by Christian Hammers <ch@debian.org>.

MySQL is available at http://www.mysql.com/.
.\" end of man page
Loading