mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
Fixes to manual.texi to make XML happy.
Docs/manual.texi: Fixes to make XML happy.
This commit is contained in:
parent
5e0851e1b3
commit
1216cfdf65
1 changed files with 42 additions and 43 deletions
|
@ -1,4 +1,4 @@
|
||||||
input texinfo @c -*-texinfo-*-
|
\input texinfo @c -*-texinfo-*-
|
||||||
@c Copyright 1997-2001 TcX AB, Detron HB and MySQL Finland AB
|
@c Copyright 1997-2001 TcX AB, Detron HB and MySQL Finland AB
|
||||||
@c
|
@c
|
||||||
@c *********************************************************
|
@c *********************************************************
|
||||||
|
@ -5079,7 +5079,6 @@ database. @xref{Privileges}.
|
||||||
@item mSQL
|
@item mSQL
|
||||||
Has a file @file{mSQL.acl} in which you can grant read/write privileges for
|
Has a file @file{mSQL.acl} in which you can grant read/write privileges for
|
||||||
users.
|
users.
|
||||||
@item
|
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
|
|
||||||
|
@ -10408,7 +10407,7 @@ all other cases if the client has TCP/IP installed. The host name specifies
|
||||||
which protocol is used:
|
which protocol is used:
|
||||||
|
|
||||||
@multitable @columnfractions .3 .7
|
@multitable @columnfractions .3 .7
|
||||||
@strong{Host name} @tab @strong{Protocol}
|
@item @strong{Host name} @tab @strong{Protocol}
|
||||||
@item NULL (none) @tab On NT, try named pipes first; if that doesn't work, use TCP/IP. On Win95/Win98, TCP/IP is used.
|
@item NULL (none) @tab On NT, try named pipes first; if that doesn't work, use TCP/IP. On Win95/Win98, TCP/IP is used.
|
||||||
@item . @tab Named pipes
|
@item . @tab Named pipes
|
||||||
@item localhost @tab TCP/IP to current host
|
@item localhost @tab TCP/IP to current host
|
||||||
|
@ -11194,6 +11193,7 @@ crash when @code{make} tries to run @code{lint} on C++ files.
|
||||||
* OpenBSD 2.8:: OpenBSD 2.8 Notes
|
* OpenBSD 2.8:: OpenBSD 2.8 Notes
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
|
This section contains notes on OpenBSD.
|
||||||
|
|
||||||
@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes
|
@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes
|
||||||
@subsubsection OpenBSD 2.5 Notes
|
@subsubsection OpenBSD 2.5 Notes
|
||||||
|
@ -11225,6 +11225,7 @@ usage, and crashes.
|
||||||
* BSDI4:: BSD/OS 4.x notes
|
* BSDI4:: BSD/OS 4.x notes
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
|
This section contains notes on BSD/OS.
|
||||||
|
|
||||||
@node BSDI2, BSDI3, BSDI, BSD Notes
|
@node BSDI2, BSDI3, BSDI, BSD Notes
|
||||||
@subsubsection BSD/OS Version 2.x Notes
|
@subsubsection BSD/OS Version 2.x Notes
|
||||||
|
@ -15226,28 +15227,28 @@ servers:
|
||||||
|
|
||||||
At least the following options should be different per server:
|
At least the following options should be different per server:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@item port=#
|
@item port=#
|
||||||
@item socket=path
|
@item socket=path
|
||||||
@item pid-file=path
|
@item pid-file=path
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
The following options should be different, if they are used:
|
The following options should be different, if they are used:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@item log=path
|
@item log=path
|
||||||
@item log-bin=path
|
@item log-bin=path
|
||||||
@item log-update=path
|
@item log-update=path
|
||||||
@item log-isam=path
|
@item log-isam=path
|
||||||
@item bdb-logdir=path
|
@item bdb-logdir=path
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
If you want more performance, you can also specify the following differently:
|
If you want more performance, you can also specify the following differently:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@item tmpdir=path
|
@item tmpdir=path
|
||||||
@item bdb-tmpdir=path
|
@item bdb-tmpdir=path
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
@xref{Command-line options}.
|
@xref{Command-line options}.
|
||||||
|
|
||||||
|
@ -18826,11 +18827,11 @@ and the server, because the server does all the work when you use
|
||||||
@code{myisamchk} also has a number of other options you can use to improve
|
@code{myisamchk} also has a number of other options you can use to improve
|
||||||
the performance of a table:
|
the performance of a table:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@item -S, --sort-index
|
@item -S, --sort-index
|
||||||
@item -R index_num, --sort-records=index_num
|
@item -R index_num, --sort-records=index_num
|
||||||
@item -a, --analyze
|
@item -a, --analyze
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
For a full description of the option. @xref{myisamchk syntax}.
|
For a full description of the option. @xref{myisamchk syntax}.
|
||||||
|
|
||||||
|
@ -18911,7 +18912,7 @@ myisamchk -r --silent --sort-index -O sort_buffer_size=16M */*.MYI
|
||||||
To get a description of a table or statistics about it, use the commands shown
|
To get a description of a table or statistics about it, use the commands shown
|
||||||
below. We explain some of the information in more detail later:
|
below. We explain some of the information in more detail later:
|
||||||
|
|
||||||
@table @code
|
@itemize @bullet
|
||||||
@item myisamchk -d tbl_name
|
@item myisamchk -d tbl_name
|
||||||
Runs @code{myisamchk} in ``describe mode'' to produce a description of
|
Runs @code{myisamchk} in ``describe mode'' to produce a description of
|
||||||
your table. If you start the MySQL server using the
|
your table. If you start the MySQL server using the
|
||||||
|
@ -18930,7 +18931,7 @@ must read the whole table.
|
||||||
|
|
||||||
@item myisamchk -eiv tbl_name
|
@item myisamchk -eiv tbl_name
|
||||||
This is like @code{-eis}, but tells you what is being done.
|
This is like @code{-eis}, but tells you what is being done.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
@cindex examples, @code{myisamchk} output
|
@cindex examples, @code{myisamchk} output
|
||||||
@cindex @code{myisamchk}, example output
|
@cindex @code{myisamchk}, example output
|
||||||
|
@ -19076,7 +19077,7 @@ Explanations for the types of information @code{myisamchk} produces are
|
||||||
given below. The ``keyfile'' is the index file. ``Record'' and ``row''
|
given below. The ``keyfile'' is the index file. ``Record'' and ``row''
|
||||||
are synonymous:
|
are synonymous:
|
||||||
|
|
||||||
@table @code
|
@itemize @bullet
|
||||||
@item ISAM file
|
@item ISAM file
|
||||||
Name of the ISAM (index) file.
|
Name of the ISAM (index) file.
|
||||||
|
|
||||||
|
@ -19136,7 +19137,7 @@ Other possible values are @code{Compressed} and @code{Packed}.
|
||||||
A list of all keys in the table. For each key, some low-level information
|
A list of all keys in the table. For each key, some low-level information
|
||||||
is presented:
|
is presented:
|
||||||
|
|
||||||
@table @code
|
@itemize @minus
|
||||||
@item Key
|
@item Key
|
||||||
This key's number.
|
This key's number.
|
||||||
|
|
||||||
|
@ -19170,7 +19171,7 @@ records there are per value for this key. A unique key always has a
|
||||||
value of 1. This may be updated after a table is loaded (or greatly
|
value of 1. This may be updated after a table is loaded (or greatly
|
||||||
changed) with @code{myisamchk -a}. If this is not updated at all, a default
|
changed) with @code{myisamchk -a}. If this is not updated at all, a default
|
||||||
value of 30 is given.
|
value of 30 is given.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
@item
|
@item
|
||||||
In the first example above, the 9th key is a multi-part key with two parts.
|
In the first example above, the 9th key is a multi-part key with two parts.
|
||||||
|
@ -19236,7 +19237,7 @@ the sum of all such losses, in bytes.
|
||||||
When the dynamic table format is used, record fragments are linked with
|
When the dynamic table format is used, record fragments are linked with
|
||||||
pointers (4 to 7 bytes each). @code{Linkdata} is the sum of the amount of
|
pointers (4 to 7 bytes each). @code{Linkdata} is the sum of the amount of
|
||||||
storage used by all such pointers.
|
storage used by all such pointers.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
If a table has been compressed with @code{myisampack}, @code{myisamchk
|
If a table has been compressed with @code{myisampack}, @code{myisamchk
|
||||||
-d} prints additional information about each table column. See
|
-d} prints additional information about each table column. See
|
||||||
|
@ -19892,7 +19893,7 @@ indicates 16 megabytes. The case of suffix letters does not matter;
|
||||||
@code{16M} and @code{16m} are equivalent:
|
@code{16M} and @code{16m} are equivalent:
|
||||||
|
|
||||||
@cindex variables, values
|
@cindex variables, values
|
||||||
@table @code
|
@itemize
|
||||||
@item @code{ansi_mode}.
|
@item @code{ansi_mode}.
|
||||||
Is @code{ON} if @code{mysqld} was started with @code{--ansi}.
|
Is @code{ON} if @code{mysqld} was started with @code{--ansi}.
|
||||||
@xref{ANSI mode}.
|
@xref{ANSI mode}.
|
||||||
|
@ -20328,7 +20329,7 @@ The version number for the server.
|
||||||
@item @code{wait_timeout}
|
@item @code{wait_timeout}
|
||||||
The number of seconds the server waits for activity on a connection before
|
The number of seconds the server waits for activity on a connection before
|
||||||
closing it. See also @code{interactive_timeout}.
|
closing it. See also @code{interactive_timeout}.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
The manual section that describes tuning MySQL contains some
|
The manual section that describes tuning MySQL contains some
|
||||||
information of how to tune the above variables. @xref{Server parameters}.
|
information of how to tune the above variables. @xref{Server parameters}.
|
||||||
|
@ -20951,7 +20952,7 @@ Most of the options to @code{safe_mysqld} are the same as the options to
|
||||||
|
|
||||||
@code{safe_mysqld} supports the following options:
|
@code{safe_mysqld} supports the following options:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@item --basedir=path
|
@item --basedir=path
|
||||||
@item --core-file-size=#
|
@item --core-file-size=#
|
||||||
Size of the core file @code{mysqld} should be able to create. Passed to @code{ulimit -c}.
|
Size of the core file @code{mysqld} should be able to create. Passed to @code{ulimit -c}.
|
||||||
|
@ -20978,7 +20979,7 @@ Number of files @code{mysqld} should be able to open. Passed to @code{ulimit -n}
|
||||||
@item --timezone=#
|
@item --timezone=#
|
||||||
Set the timezone (the @code{TZ}) variable to the value of this parameter.
|
Set the timezone (the @code{TZ}) variable to the value of this parameter.
|
||||||
@item --user=#
|
@item --user=#
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
The @code{safe_mysqld} script is written so that it normally is able to start
|
The @code{safe_mysqld} script is written so that it normally is able to start
|
||||||
a server that was installed from either a source or a binary version of
|
a server that was installed from either a source or a binary version of
|
||||||
|
@ -21058,7 +21059,7 @@ list. Anything after a white space is ignored.
|
||||||
|
|
||||||
@code{mysqld_multi} supports the following options:
|
@code{mysqld_multi} supports the following options:
|
||||||
|
|
||||||
@table @code
|
@itemize
|
||||||
@cindex config-file option
|
@cindex config-file option
|
||||||
@item --config-file=...
|
@item --config-file=...
|
||||||
Alternative config file. NOTE: This will not affect this program's own
|
Alternative config file. NOTE: This will not affect this program's own
|
||||||
|
@ -21103,7 +21104,7 @@ MySQL user for @code{mysqladmin}.
|
||||||
@cindex version option
|
@cindex version option
|
||||||
@item --version
|
@item --version
|
||||||
Print the version number and exit.
|
Print the version number and exit.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
Some notes about @code{mysqld_multi}:
|
Some notes about @code{mysqld_multi}:
|
||||||
|
|
||||||
|
@ -21276,7 +21277,7 @@ file. It is permissible to omit the @file{.MYI} extension.
|
||||||
|
|
||||||
@code{myisampack} supports the following options:
|
@code{myisampack} supports the following options:
|
||||||
|
|
||||||
@table @code
|
@itemize @bullet
|
||||||
@item -b, --backup
|
@item -b, --backup
|
||||||
Make a backup of the table as @code{tbl_name.OLD}.
|
Make a backup of the table as @code{tbl_name.OLD}.
|
||||||
|
|
||||||
|
@ -21330,7 +21331,7 @@ Wait and retry if table is in use. If the @code{mysqld} server was
|
||||||
invoked with the @code{--skip-locking} option, it is not a good idea to
|
invoked with the @code{--skip-locking} option, it is not a good idea to
|
||||||
invoke @code{myisampack} if the table might be updated during the
|
invoke @code{myisampack} if the table might be updated during the
|
||||||
packing process.
|
packing process.
|
||||||
@end table
|
@end itemize
|
||||||
|
|
||||||
@cindex examples, compressed tables
|
@cindex examples, compressed tables
|
||||||
The sequence of commands shown below illustrates a typical table compression
|
The sequence of commands shown below illustrates a typical table compression
|
||||||
|
@ -23922,10 +23923,9 @@ logs. In pre 3.23.26 versions the command was called
|
||||||
is a comma-separated list of @code{master_def} where @code{master_def} is
|
is a comma-separated list of @code{master_def} where @code{master_def} is
|
||||||
one of the following: @code{MASTER_HOST}, @code{MASTER_USER},
|
one of the following: @code{MASTER_HOST}, @code{MASTER_USER},
|
||||||
@code{MASTER_PASSWORD}, @code{MASTER_PORT}, @code{MASTER_CONNECT_RETRY},
|
@code{MASTER_PASSWORD}, @code{MASTER_PORT}, @code{MASTER_CONNECT_RETRY},
|
||||||
@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. Example:
|
@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. For example:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
|
|
||||||
CHANGE MASTER TO
|
CHANGE MASTER TO
|
||||||
MASTER_HOST='master2.mycompany.com',
|
MASTER_HOST='master2.mycompany.com',
|
||||||
MASTER_USER='replication',
|
MASTER_USER='replication',
|
||||||
|
@ -23933,7 +23933,6 @@ CHANGE MASTER TO
|
||||||
MASTER_PORT=3306,
|
MASTER_PORT=3306,
|
||||||
MASTER_LOG_FILE='master2-bin.001',
|
MASTER_LOG_FILE='master2-bin.001',
|
||||||
MASTER_LOG_POS=4;
|
MASTER_LOG_POS=4;
|
||||||
|
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
You only need to specify the values that need to be changed. The values that
|
You only need to specify the values that need to be changed. The values that
|
||||||
|
@ -24611,7 +24610,7 @@ multi-threaded tests to the benchmark suite.
|
||||||
For example, (run on the same NT 4.0 machine):
|
For example, (run on the same NT 4.0 machine):
|
||||||
|
|
||||||
@multitable @columnfractions .6 .2 .2
|
@multitable @columnfractions .6 .2 .2
|
||||||
@strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds}
|
@item @strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds}
|
||||||
@item mysql @tab 367 @tab 249
|
@item mysql @tab 367 @tab 249
|
||||||
@item mysql_odbc @tab 464
|
@item mysql_odbc @tab 464
|
||||||
@item db2_odbc @tab 1206
|
@item db2_odbc @tab 1206
|
||||||
|
@ -24623,7 +24622,7 @@ For example, (run on the same NT 4.0 machine):
|
||||||
@end multitable
|
@end multitable
|
||||||
|
|
||||||
@multitable @columnfractions .6 .2 .2
|
@multitable @columnfractions .6 .2 .2
|
||||||
@strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds}
|
@item @strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds}
|
||||||
@item mysql @tab 381 @tab 206
|
@item mysql @tab 381 @tab 206
|
||||||
@item mysql_odbc @tab 619
|
@item mysql_odbc @tab 619
|
||||||
@item db2_odbc @tab 3460
|
@item db2_odbc @tab 3460
|
||||||
|
@ -41972,12 +41971,12 @@ You need to use the following functions when you want to create a
|
||||||
threaded client. @xref{Threaded clients}.
|
threaded client. @xref{Threaded clients}.
|
||||||
|
|
||||||
@menu
|
@menu
|
||||||
* my_init():: @code{my_init()}
|
* my_init:: @code{my_init()}
|
||||||
* mysql_thread_init():: @code{mysql_thread_init()}
|
* mysql_thread_init:: @code{mysql_thread_init()}
|
||||||
* mysql_thread_end():: @code{mysql_thread_end()}
|
* mysql_thread_end:: @code{mysql_thread_end()}
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
@node my_init(), mysql_thread_init(), C Thread functions, C Thread functions
|
@node my_init, mysql_thread_init, C Thread functions, C Thread functions
|
||||||
@subsubsection @code{my_init()}
|
@subsubsection @code{my_init()}
|
||||||
|
|
||||||
@findex @code{my_init()}
|
@findex @code{my_init()}
|
||||||
|
@ -41996,7 +41995,7 @@ This is automatically called by @code{mysql_init()},
|
||||||
|
|
||||||
none.
|
none.
|
||||||
|
|
||||||
@node mysql_thread_init(), mysql_thread_end(), my_init(), C Thread functions
|
@node mysql_thread_init, mysql_thread_end, my_init, C Thread functions
|
||||||
@subsubsection @code{mysql_thread_init()}
|
@subsubsection @code{mysql_thread_init()}
|
||||||
|
|
||||||
@findex @code{mysql_thread_init()}
|
@findex @code{mysql_thread_init()}
|
||||||
|
@ -42012,7 +42011,7 @@ This is automatically called by @code{my_init()} and @code{mysql_connect()}.
|
||||||
|
|
||||||
none.
|
none.
|
||||||
|
|
||||||
@node mysql_thread_end(), , mysql_thread_init(), C Thread functions
|
@node mysql_thread_end, , mysql_thread_init, C Thread functions
|
||||||
@subsubsection @code{mysql_thread_end()}
|
@subsubsection @code{mysql_thread_end()}
|
||||||
|
|
||||||
@findex @code{mysql_thread_end()}
|
@findex @code{mysql_thread_end()}
|
||||||
|
@ -42042,11 +42041,11 @@ possible to choose between using the embedded MySQL server and
|
||||||
a stand-alone server without modifying any code.
|
a stand-alone server without modifying any code.
|
||||||
|
|
||||||
@menu
|
@menu
|
||||||
* mysql_server_init()::
|
* mysql_server_init:: @code{mysql_server_init()}
|
||||||
* mysql_server_end()::
|
* mysql_server_end:: @code{mysql_server_end()}
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
@node mysql_server_init(), mysql_server_end(), C Embedded Server functions, C Embedded Server functions
|
@node mysql_server_init, mysql_server_end, C Embedded Server functions, C Embedded Server functions
|
||||||
@subsubsection @code{mysql_server_init()}
|
@subsubsection @code{mysql_server_init()}
|
||||||
|
|
||||||
@findex @code{mysql_server_init()}
|
@findex @code{mysql_server_init()}
|
||||||
|
@ -42106,7 +42105,7 @@ int main(void) @{
|
||||||
|
|
||||||
none.
|
none.
|
||||||
|
|
||||||
@node mysql_server_end(), , mysql_server_init(), C Embedded Server functions
|
@node mysql_server_end, , mysql_server_init, C Embedded Server functions
|
||||||
@subsubsection @code{mysql_server_end()}
|
@subsubsection @code{mysql_server_end()}
|
||||||
|
|
||||||
@findex @code{mysql_server_end()}
|
@findex @code{mysql_server_end()}
|
||||||
|
@ -46229,7 +46228,7 @@ With source code. By Matthias Fichtner.
|
||||||
A library to use MySQL with Delphi}.
|
A library to use MySQL with Delphi}.
|
||||||
|
|
||||||
@item @uref{http://www.geocities.com/CapeCanaveral/2064/mysql.html, Delphi TDataset-component}.
|
@item @uref{http://www.geocities.com/CapeCanaveral/2064/mysql.html, Delphi TDataset-component}.
|
||||||
@item
|
|
||||||
@item @uref{http://www.mysql.com/Downloads/Contrib/Win32/SBMySQL50Share.exe, Delphi 5 Shareware MySQL Dataset Components}
|
@item @uref{http://www.mysql.com/Downloads/Contrib/Win32/SBMySQL50Share.exe, Delphi 5 Shareware MySQL Dataset Components}
|
||||||
@end itemize
|
@end itemize
|
||||||
|
|
||||||
|
@ -49931,10 +49930,10 @@ Fix storage of floating-point values in @code{TIME} columns.
|
||||||
Changed parsing of @code{TIME} strings to be more strict. Now the
|
Changed parsing of @code{TIME} strings to be more strict. Now the
|
||||||
fractional second part is detected (and currently skipped). The
|
fractional second part is detected (and currently skipped). The
|
||||||
following formats are supported:
|
following formats are supported:
|
||||||
@table @code
|
@itemize
|
||||||
@item [[DAYS] [H]H:]MM:]SS[.fraction]
|
@item [[DAYS] [H]H:]MM:]SS[.fraction]
|
||||||
@item [[[[[H]H]H]H]MM]SS[.fraction]
|
@item [[[[[H]H]H]H]MM]SS[.fraction]
|
||||||
@end table
|
@end itemize
|
||||||
@item
|
@item
|
||||||
Detect (and ignore) second fraction part from @code{DATETIME}.
|
Detect (and ignore) second fraction part from @code{DATETIME}.
|
||||||
@item
|
@item
|
||||||
|
|
Loading…
Add table
Reference in a new issue