Commit ae60d9dd authored by unknown's avatar unknown
Browse files

- after merge fixes 


configure.in:
  Auto merged
support-files/mysql.spec.sh:
   - after-merge fix
parents 987c33a9 0ffe070c

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2347,10 +2347,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,

man/Makefile.am

+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 isamchk.1 isamlog.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 isamchk.1.in isamlog.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/isamchk.1.in

deleted100644 → 0
+0 −145
Original line number Diff line number Diff line 
.TH isamchk 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"

.SH NAME

.BR isamchk

 \- Description, check and repair of ISAM tables.

Used without options all tables on the command will be checked for errors

.SH USAGE

isamchk [OPTIONS] tables[.ISM]

.SH SYNOPSIS

.B isamchk

.RB [  \-a | \-\-analyze ]

.RB [  \-# | \-\-debug=...  ]

.RB [  \-\-character\-sets\-dir=...]

.RB [  \-C | \-\-default\-character\-set=...]

.RB [  \-d | \-\-description  ]

.RB [  \-e | \-\-extend\-check  ]

.RB [  \-f | \-\-force  ]      

.RB [  \-? | \-\-help       ]   

.RB [  \-i | \-\-information  ]

.RB [  \-k | \-\-keys\-used=#   ]

.RB [  \-l | \-\-no\-symlinks]   

.RB [  \-q | \-\-quick      ]  

.RB [  \-r | \-\-recover       ]

.RB [  \-o | \-\-safe\-recover  ]

.RB [  \-O | "\-\-set\-variable var=option"]

.RB [  \-s | \-\-silent ]      

.RB [  \-S | \-\-sort\-index    ]

.RB [  \-R | \-\-sort\-records=#]

.RB [  \-u | \-\-unpack       ]

.RB [  \-v | \-\-verbose  ]    

.RB [  \-V | \-\-version ]    

.RB [  \-w | \-\-wait ]         

.SH DESCRIPTION

.TP

.BR  \-a | \-\-analyze

Analyze distribution of keys. Will make some joins in

MySQL faster.

.TP 

.BR  \-# | \-\-debug=...

Output debug log. Often this is 'd:t:o ,filename`

.TP 

.BR \-\-character\-sets\-dir=...

Directory where character sets are

.TP 

.BR  \-C | \-\-default\-character\-set=...

Set the default character set

.TP 

.BR    \-d | \-\-description

Prints some information about table.

.TP 

.BR    \-e | \-\-extend\-check

Check the table VERY thoroughly.  One need use this

only in extreme cases as isamchk should normally find

all errors even without this switch

.TP 

.BR    \-f | \-\-force

Overwrite old temporary files.

If one uses \-f when checking tables (running isamchk

without \-r), isamchk will automatically restart with

\-r on any wrong table.

.TP 

.BR    \-? | \-\-help

Display help and exit.

.TP 

.BR    \-i | \-\-information

Print statistics information about the table

.TP 

.BR    \-k | \-\-keys\-used=#   

Used with '\-r'. Tell ISAM to update only the first

# keys.  This can be used to get faster inserts!

.TP 

.BR    \-l | \-\-no\-symlinks   

Do not follow symbolic links when repairing. Normally

isamchk repairs the table a symlink points at.

.TP 

.BR    \-q | \-\-quick

Used with \-r to get a faster repair. (The data file

isn't touched.) One can give a second '\-q' to force

isamchk to modify the original datafile.

.TP 

.BR    \-r | \-\-recover

Can fix almost anything except unique keys that aren't

unique.

.TP 

.BR    \-o | \-\-safe\-recover  

Uses old recovery method; slower than '\-r' but can

handle a couple of cases that '\-r' cannot handle.

.TP 

.BR    \-O | " \-\-set\-variable var=option "

Change the value of a variable.

.TP 

.BR    \-s | \-\-silent

Only print errors.  One can use two \-s to make isamchk

very silent

.TP 

.BR    \-S | \-\-sort\-index

Sort index blocks.  This speeds up 'read\-next' in

applications

.TP 

.BR    \-R | \-\-sort\-records=#

Sort records according to an index.  This makes your

data much more localized and may speed up things

(It may be VERY slow to do a sort the first time!)

.TP 

.BR    \-u | \-\-unpack

Unpack file packed with pack_isam.

.TP 

.BR    \-v | \-\-verbose

Print more information. This can be used with

\-d and \-e. Use many \-v for more verbosity!

.TP 

.BR    \-V | \-\-version

Print version and exit.

.TP 

.BR    \-w | \-\-wait

Wait if table is locked.

.SH "SEE ALSO"

isamlog(1),

mysql(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 1.0, 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 L. (Kill-9) Pedersen 

(kill-9@kill\-9.dk), Mercurmedia Data Model Architect /

system developer (http://www.mercurmedia.com)



.\" end of man page

man/isamlog.1.in

deleted100644 → 0
+0 −107
Original line number Diff line number Diff line 
.TH isamlog 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"

.SH NAME 

isamlog - Write info about whats in a nisam log file. 

.SH USAGE 

isamlog [-?iruvIV] [-c #] [-f #] [-F filepath/] [-o #] [-R file recordpos] [-w write_file] [log-filename [table ...]] 

.SH SYNOPSIS 

.B isamlog 

.RB [ -?  |  -I ] 

.RB [ -V ] 

.RB [ -c ] 

.RB [ -f ] 

.RB [ -F ] 

.RB [ -i ] 

.RB [ -o ] 

.RB [ "-p #" ] 

.RB [ -r ] 

.RB [ -R ] 

.RB [ -u ] 

.RB [ -v ] 

.RB [ -w ] 

.SH DESCRIPTION 

.TP

.BR isamlog

.TP

.BR -?  |  -I

info

.TP

.BR -V

version

.TP

.BR -c

do only # commands

.TP

.BR -f

max open files

.TP

.BR -F

file path

.TP

.BR -i

extra info

.TP

.BR -o

offset

.TP

.BR "-p #"

remove # components from path

.TP

.BR -r

recover

.TP

.BR -R

file recordposition

.TP

.BR -u

update

.TP

.BR -v

verbose

.TP

.BR -w

write file

.SH NOTE 

If no file name is given isam.log is used

One can give a second and a third '-v' for more verbose.

Normaly one does a update (-u).

If a recover is done all writes and all possibly updates and deletes is done

and errors are only counted.

If one gives table names as arguments only these tables will be updated







.SH "SEE ALSO" 

isamchk(1),

mysql(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 1.0, 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 L. (Kill-9) Pedersen 

(kill-9@kill-9.dk), Mercurmedia Data Model Architect /

system developer (http://www.mercurmedia.com)





.\" end of man page

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