Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3281 05/08/15 13:54:03 paul@stripped +4 -0
De-cruft.
refman/mysql-database-administration.xml
1.50 05/08/15 13:54:02 paul@stripped +149 -206
De-cruft.
refman-5.1/mysql-database-administration.xml
1.9 05/08/15 13:54:02 paul@stripped +107 -148
De-cruft.
refman-5.0/mysql-database-administration.xml
1.10 05/08/15 13:54:01 paul@stripped +107 -148
De-cruft.
refman-4.1/mysql-database-administration.xml
1.41 05/08/15 13:54:01 paul@stripped +68 -77
De-cruft.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: kite-hub.kitebird.com
# Root: /src/extern/MySQL/bk/mysqldoc
--- 1.8/refman-5.1/mysql-database-administration.xml 2005-08-15 13:27:10 -05:00
+++ 1.9/refman-5.1/mysql-database-administration.xml 2005-08-15 13:54:02 -05:00
@@ -5836,31 +5836,9 @@
</para>
</listitem>
-<!-- TODO: Document date_format and datetime_format. -->
+<!-- TODO: describe date_format when implemented -->
-<!--
- <listitem>
- <para><literal>date_format</literal></para>
-
- <para></para>
- </listitem>
-
- <listitem>
- <para><literal>datetime_format</literal></para>
-
- <para></para>
- </listitem>
--->
-
-<!-- TODO: Document div_precision_increment. -->
-
-<!--
- <listitem>
- <para><literal>div_precision_increment</literal></para>
-
- <para></para>
- </listitem>
--->
+<!-- TODO: describe datetime_format when implemented -->
<listitem>
<para>
@@ -6385,20 +6363,14 @@
<!-- TODO: also used on Windows for dir symlinking? -->
</para>
-
- <para>
-<!-- TODO: it may be that init_connect/init_slave should be discussed in -->
- </para>
-
- <para>
-<!-- a separate section that describes how to control client/slave startup. -->
- </para>
-
- <para>
-<!-- Move the examples to such a section if it is written. -->
- </para>
</listitem>
+<!--
+ TODO: it may be that init_connect/init_slave should be discussed
+ in a separate section that describes how to control client/slave
+ startup. Move the examples to such a section if this is done.
+-->
+
<listitem>
<para>
<literal>init_connect</literal>
@@ -6509,11 +6481,6 @@
complex join between several tables for which indexes are
not used, multiple join buffers might be necessary.
</para>
-
-<!--
- TODO: Make texi2html support index @anchor{Index cache size}. Then
- change some xrefs to point here
--->
</listitem>
<listitem>
@@ -7743,9 +7710,7 @@
<xref linkend="old-client"/>.
</para>
- <para>
<!-- TODO: this doesn't really belong here in a discussion of server variables -->
- </para>
<para>
When used as a client-side option, the client refuses to
@@ -8120,20 +8085,10 @@
this value. The default is large enough for normal
operation. See <xref linkend="mysql-benchmarks"/>.
</para>
-
- <para>
-<!-- TODO: uncomment when implemented -->
- </para>
-
- <para>
-<!-- @item time_format -->
- </para>
-
- <para>
-<!-- ADD DESCRIPTION -->
- </para>
</listitem>
+<!-- TODO: describe time_format when implemented -->
+
<listitem>
<para>
<literal>time_zone</literal>
@@ -9246,47 +9201,49 @@
The
<literal>Com_stmt_<replaceable>xxx</replaceable></literal>
status variables were added in 5.0.8:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <literal>Com_stmt_prepare</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_execute</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_fetch</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_send_long_data</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_reset</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_close</literal>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_prepare</literal>
+ </para>
+ </listitem>
- </itemizedlist>
+ <listitem>
+ <para>
+ <literal>Com_stmt_execute</literal>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_fetch</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_send_long_data</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_reset</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_close</literal>
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
Those variables stand for prepared statements commands.
Their names refer to the
<literal>COM_<replaceable>xxx</replaceable></literal>
@@ -10466,11 +10423,9 @@
<para>
The number of sorts that were done by scanning the table.
</para>
+ </listitem>
- <para>
<!-- TODO: add SSL status variables -->
- </para>
- </listitem>
<listitem>
<para>
@@ -13368,6 +13323,7 @@
<para>
Note: The netmask can only be used to tell the server to use
8, 16, 24, or 32 bits of the address, for example:
+ </para>
<programlisting>
192.0.0.0/255.0.0.0 (anything on the 192 class A network)
@@ -13376,12 +13332,13 @@
192.168.1.1 (only this specific IP)
</programlisting>
+ <para>
The following netmask (28 bits) will not work:
+ </para>
<programlisting>
192.168.0.1/255.255.255.240
</programlisting>
- </para>
</listitem>
<listitem>
@@ -16939,49 +16896,50 @@
<para>
Currently, yaSSL support is available for these platforms:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- Linux/x86-64 Red Hat Enterprise 3.0
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux/x86-64 Red Hat Enterprise 3.0
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux RHAS21 Itanium-2 with gcc, statically linked
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux RHAS21 Itanium-2 with gcc, statically linked
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux Itanium-2 with gcc
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux Itanium-2 with gcc
+ </para>
+ </listitem>
- <listitem>
- <para>
- Windows (all builds)
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Windows (all builds)
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
If you want to enable yaSSL when building MySQL from source,
you should configure MySQL like this:
+ </para>
<programlisting>
./configure --with-yassl=yes
</programlisting>
- </para>
<para>
To start the MySQL server with yaSSL support, use the same
options as with OpenSSL support and identify the certificates
needed to establish a secure connection:
+ </para>
<programlisting>
shell> <userinput>mysqld --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -16989,35 +16947,35 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--ssl-ca</option> identifies the Certificate
- Authority certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-ca</option> identifies the Certificate
+ Authority certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-cert</option> identifies the server
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-cert</option> identifies the server
+ certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-key</option> identifies the client
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-key</option> identifies the client
+ certificate.
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
To establish a secure connection to a MySQL server with yaSSL
support, start a client like this:
+ </para>
<programlisting>
shell> <userinput>mysql --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -17025,6 +16983,7 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
+ <para>
In other words, the options are the same as for the server,
and the Certificate Authority certificate has to be the same.
</para>
@@ -18379,20 +18338,20 @@
server is started. The option for enabling binary logging is
<option>--log-bin</option>. To determine the name of the current
binary log file, enter the following statement in MySQL:
+ </para>
<programlisting>
SHOW BINLOG EVENTS \G
</programlisting>
- </para>
<para>
If you prefer, you could enter the following from the command
line instead:
+ </para>
<programlisting>
mysql --user=<replaceable>root</replaceable> -p<replaceable>my_pwd</replaceable> -e 'SHOW BINLOG EVENTS \G'
</programlisting>
- </para>
<para>
Replace the password <replaceable>my_pwd</replaceable> with the
@@ -18413,12 +18372,12 @@
April 20, 2005) an SQL statement was executed which deleted a
large table. To restore the table and data, you could restore
the previous night's backup, and then enter the following:
+ </para>
<programlisting>
mysqlbinlog --stop-date="2005-04-20 9:59:59" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable>
</programlisting>
- </para>
<para>
This will recover all of the data up until the date and time
@@ -18429,12 +18388,12 @@
afterwards, as well. Based on this, you could run the
<command>mysqlbinlog</command> again with a start date and
time like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 10:01:00" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
In this line, the SQL statements logged from 10:01 a.m. will
@@ -18466,12 +18425,12 @@
range of times around when the unwanted transaction was
executed, but redirect the results to a text file for
examination. This can be done like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 9:55:00" --stop-date="2005-04-20 10:05:00" \
/var/log/mysql/bin.123456 > /tmp/mysql_restore.sql
</programlisting>
- </para>
<para>
This will create a small text file in the
@@ -18485,6 +18444,7 @@
After restoring the previous backup file, using the position
numbers, you would then enter something like the following
from the command-line:
+ </para>
<programlisting>
mysqlbinlog --stop-position="368312" /var/log/mysql/bin.123456 \
@@ -18493,7 +18453,6 @@
mysqlbinlog --start-position="368315" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
The first line above will recover all of the transactions up
@@ -24222,6 +24181,7 @@
about 40KB to allocate its structures. (The exact size depends
on architecture.) If you set the value too small, you'll get a
warning, like in this example:
+ </para>
<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
@@ -24243,7 +24203,6 @@
| query_cache_size | 41984 |
+------------------+-------+
</programlisting>
- </para>
<para>
If the query cache size is greater than 0, the
--- 1.40/refman-4.1/mysql-database-administration.xml 2005-08-15 13:27:10 -05:00
+++ 1.41/refman-4.1/mysql-database-administration.xml 2005-08-15 13:54:01 -05:00
@@ -2740,28 +2740,28 @@
The <option>--new</option> option can be used to make the
server behave as 4.1 in certain respects, easing a 4.0 to
4.1 upgrade:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- Hexadecimal strings such as <literal>0xFF</literal>
- are treated as strings by default rather than as
- numbers. (Works in 4.0.12 and up.)
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>TIMESTAMP</literal> is returned as a string
- with the format <literal>'YYYY-MM-DD
- HH:MM:SS'</literal>. (Works in 4.0.13 and up.) See
- <xref linkend="column-types"/>.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Hexadecimal strings such as <literal>0xFF</literal> are
+ treated as strings by default rather than as numbers.
+ (Works in 4.0.12 and up.)
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ <listitem>
+ <para>
+ <literal>TIMESTAMP</literal> is returned as a string
+ with the format <literal>'YYYY-MM-DD
+ HH:MM:SS'</literal>. (Works in 4.0.13 and up.) See
+ <xref linkend="column-types"/>.
+ </para>
+ </listitem>
+
+ </itemizedlist>
<para>
This option can be used to help you see how your
@@ -3214,7 +3214,7 @@
</para>
<!--
- Put the Unix description first, because the option name relates
+ Kep the Unix description first, because the option name relates
directly to the Unix meaning. Putting the Windows meaning first
makes this more confusing.
-->
@@ -3514,11 +3514,13 @@
<literal>mysql</literal> database and the
<literal>User</literal> column in that table become
reserved, so you must quote them:
+ </para>
<programlisting>
SELECT "User" FROM mysql."user";
</programlisting>
+ <para>
(New in MySQL 4.0.0)
</para>
</listitem>
@@ -4665,19 +4667,9 @@
</para>
</listitem>
-<!--
- TODO: uncomment when implemented
-
- @item date_format
- [ADD DESCRIPTION]
--->
+<!-- TODO: describe date_format when implemented -->
-<!--
- TODO: uncomment when implemented
-
- @item datetime_format
- [ADD DESCRIPTION]
--->
+<!-- TODO: describe datetime_format when implemented -->
<listitem>
<para>
@@ -6911,12 +6903,7 @@
</para>
</listitem>
-<!--
- TODO: Uncomment when implemented:
-
- @item time_format
- [ADD DESCRIPTION]
--->
+<!-- TODO: describe time_format when implemented -->
<listitem>
<para>
@@ -7948,41 +7935,43 @@
New
<literal>Com_stmt_<replaceable>xxx</replaceable></literal>
status variables have been added in MySQL 4.1.13.
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_prepare</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_execute</literal>
+ </para>
+ </listitem>
- <itemizedlist>
+ <listitem>
+ <para>
+ <literal>Com_stmt_send_long_data</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_reset</literal>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <literal>Com_stmt_prepare</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_execute</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_send_long_data</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_reset</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_close</literal>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_close</literal>
+ </para>
+ </listitem>
- </itemizedlist>
+ </itemizedlist>
+ <para>
Those variables stand for prepared statements commands.
Their names refer to the
<literal>COM_<replaceable>xxx</replaceable></literal>
@@ -11452,6 +11441,7 @@
<para>
Note: The netmask can only be used to tell the server to use
8, 16, 24, or 32 bits of the address, for example:
+ </para>
<programlisting>
192.0.0.0/255.0.0.0 (anything on the 192 class A network)
@@ -11460,12 +11450,13 @@
192.168.1.1 (only this specific IP)
</programlisting>
+ <para>
The following netmask (28 bits) will not work:
+ </para>
<programlisting>
192.168.0.1/255.255.255.240
</programlisting>
- </para>
</listitem>
<listitem>
@@ -16383,20 +16374,20 @@
server is started. The option for enabling binary logging is
<option>--log-bin</option>. To determine the name of the current
binary log file, enter the following statement in MySQL:
+ </para>
<programlisting>
SHOW BINLOG EVENTS \G
</programlisting>
- </para>
<para>
If you prefer, you could enter the following from the command
line instead:
+ </para>
<programlisting>
mysql --user=<replaceable>root</replaceable> -p<replaceable>my_pwd</replaceable> -e 'SHOW BINLOG EVENTS \G'
</programlisting>
- </para>
<para>
Replace the password <replaceable>my_pwd</replaceable> with the
@@ -16418,12 +16409,12 @@
was executed which deleted a large table. To restore the table
and data, you could restore the previous night's backup, and
then enter the following:
+ </para>
<programlisting>
mysqlbinlog --stop-date="2005-04-20 9:59:59" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable>
</programlisting>
- </para>
<para>
This will recover all of the data up until the date and time
@@ -16434,12 +16425,12 @@
afterwards, as well. Based on this, you could run the
<command>mysqlbinlog</command> again with a start date and
time like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 10:01:00" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
In this line, the SQL statements logged from 10:01 a.m. will
@@ -16471,12 +16462,12 @@
range of times around when the unwanted transaction was
executed, but redirect the results to a text file for
examination. This can be done like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 9:55:00" --stop-date="2005-04-20 10:05:00" \
/var/log/mysql/bin.123456 > /tmp/mysql_restore.sql
</programlisting>
- </para>
<para>
This will create a small text file in the
@@ -16490,6 +16481,7 @@
by a number. After restoring the previous backup file, using
the position numbers, you would then enter something like the
following from the command line:
+ </para>
<programlisting>
mysqlbinlog --stop-position="368312" /var/log/mysql/bin.123456 \
@@ -16498,7 +16490,6 @@
mysqlbinlog --start-position="368315" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
The first line above will recover all of the transactions up
@@ -22457,6 +22448,7 @@
about 40KB to allocate its structures. (The exact size depends
on architecture.) If you set the value too small, you will get a
warning, like in this example:
+ </para>
<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
@@ -22478,7 +22470,6 @@
| query_cache_size | 41984 |
+------------------+-------+
</programlisting>
- </para>
<para>
If the query cache size is greater than 0, the
--- 1.49/refman/mysql-database-administration.xml 2005-08-15 13:27:10 -05:00
+++ 1.50/refman/mysql-database-administration.xml 2005-08-15 13:54:02 -05:00
@@ -3528,28 +3528,28 @@
The <option>--new</option> option can be used to make the
server behave as 4.1 in certain respects, easing a 4.0 to
4.1 upgrade:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- Hexadecimal strings such as <literal>0xFF</literal>
- are treated as strings by default rather than as
- numbers. (Works in 4.0.12 and up.)
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>TIMESTAMP</literal> is returned as a string
- with the format <literal>'YYYY-MM-DD
- HH:MM:SS'</literal>. (Works in 4.0.13 and up.) See
- <xref linkend="column-types"/>.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Hexadecimal strings such as <literal>0xFF</literal> are
+ treated as strings by default rather than as numbers.
+ (Works in 4.0.12 and up.)
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ <listitem>
+ <para>
+ <literal>TIMESTAMP</literal> is returned as a string
+ with the format <literal>'YYYY-MM-DD
+ HH:MM:SS'</literal>. (Works in 4.0.13 and up.) See
+ <xref linkend="column-types"/>.
+ </para>
+ </listitem>
+
+ </itemizedlist>
<para>
This option can be used to help you see how your
@@ -3996,17 +3996,13 @@
<listitem>
<para>
<option>--socket=<replaceable>path</replaceable></option>
-
-<!-- Put the Unix description first, because the option name relates directly -->
</para>
- <para>
-<!-- to the Unix meaning. Putting the Windows meaning first makes this more -->
- </para>
-
- <para>
-<!-- confusing. -->
- </para>
+<!--
+ Kep the Unix description first, because the option name relates
+ directly to the Unix meaning. Putting the Windows meaning first
+ makes this more confusing.
+-->
<para>
On Unix, this option specifies the Unix socket file to use
@@ -4016,16 +4012,13 @@
use a named pipe. The default value is
<literal>MySQL</literal>.
</para>
-
- <para>
-<!-- TODO: some of these option values currently are unimplemented. -->
- </para>
-
- <para>
-<!-- Need to say which ones. -->
- </para>
</listitem>
+<!--
+ TODO: some of these option values currently are unimplemented.
+ Need to say which ones.
+-->
+
<listitem>
<para>
<option>--sql-mode=<replaceable>value</replaceable>[,<replaceable>value</replaceable>[,<replaceable>value</replaceable>...]]</option>
@@ -6092,31 +6085,11 @@
The MySQL data directory. This variable can be set with the
<option>--datadir</option> option.
</para>
+ </listitem>
- <para>
-<!-- TODO: uncomment when implemented -->
- </para>
-
- <para>
-<!-- @item date_format -->
- </para>
-
- <para>
-<!-- ADD DESCRIPTION -->
- </para>
-
- <para>
-<!-- TODO: uncomment when implemented -->
- </para>
-
- <para>
-<!-- @item datetime_format -->
- </para>
+<!-- TODO: describe date_format when implemented -->
- <para>
-<!-- ADD DESCRIPTION -->
- </para>
- </listitem>
+<!-- TODO: describe datetime_format when implemented -->
<listitem>
<para>
@@ -6539,21 +6512,17 @@
<literal>EXAMPLE</literal> tables, <literal>NO</literal> if
not. This variable was added in MySQL 4.1.4.
</para>
+ </listitem>
+ <listitem>
<para>
-<!-- TODO: Uncomment after have_federated_db gets renamed to _engine -->
- </para>
-
- <para>
-<!-- @item have_federated_engine -->
- </para>
-
- <para>
-<!-- @code{YES} if @command{mysqld} supports @code{FEDERATED} tables, @code{NO} -->
+ <literal>have_federated_engine</literal>
</para>
<para>
-<!-- if not. This variable was added in MySQL 5.0.3. -->
+ <literal>YES</literal> if <command>mysqld</command> supports
+ <literal>FEDERATED</literal> tables, <literal>NO</literal>
+ if not. This variable was added in MySQL 5.0.3.
</para>
</listitem>
@@ -6673,20 +6642,14 @@
<para>
This variable was added in MySQL 4.0.0.
</para>
-
- <para>
-<!-- TODO: it may be that init_connect/init_slave should be discussed in -->
- </para>
-
- <para>
-<!-- a separate section that describes how to control client/slave startup. -->
- </para>
-
- <para>
-<!-- Move the examples to such a section if it is written. -->
- </para>
</listitem>
+<!--
+ TODO: it may be that init_connect/init_slave should be discussed
+ in a separate section that describes how to control client/slave
+ startup. Move the examples to such a section if this is done.
+-->
+
<listitem>
<para>
<literal>init_connect</literal>
@@ -6800,14 +6763,6 @@
complex join between several tables for which indexes are
not used, multiple join buffers might be necessary.
</para>
-
- <para>
-<!-- Make texi2html support index @anchor{Index cache size}. Then change -->
- </para>
-
- <para>
-<!-- some xrefs to point here -->
- </para>
</listitem>
<listitem>
@@ -7977,17 +7932,13 @@
helpful in improving performance, because it can reduce the
need for the server to perform memory allocation during
query execution operations.
-
-<!-- It won't necessarily eliminate allocation completely; server *may* still -->
- </para>
-
- <para>
-<!-- allocate memory in some situations, e.g., transaction-related or sp-related -->
</para>
- <para>
-<!-- ops. -->
- </para>
+<!--
+ It won't necessarily eliminate allocation completely; server *may* still
+ allocate memory in some situations, e.g., transaction-related or sp-related
+ ops.
+-->
<para>
This variable was added in MySQL 4.0.16.
@@ -8111,9 +8062,7 @@
and the privilege tables are in pre-4.1 format.
</para>
- <para>
<!-- TODO: this doesn't really belong here in a discussion of server variables -->
- </para>
<para>
When used as a client-side option, the client refuses to
@@ -8498,20 +8447,10 @@
this value. The default is large enough for normal
operation. See <xref linkend="mysql-benchmarks"/>.
</para>
-
- <para>
-<!-- TODO: uncomment when implemented -->
- </para>
-
- <para>
-<!-- @item time_format -->
- </para>
-
- <para>
-<!-- ADD DESCRIPTION -->
- </para>
</listitem>
+<!-- TODO: describe time_format when implemented -->
+
<listitem>
<para>
<literal>time_zone</literal>
@@ -9610,48 +9549,50 @@
<literal>Com_stmt_<replaceable>xxx</replaceable></literal>
status variables have been added in MySQL 4.1.13 or 5.0.8,
respectively.
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_prepare</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_execute</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_fetch</literal> (not available in
+ versions before 5.0)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_send_long_data</literal>
+ </para>
+ </listitem>
- <itemizedlist>
+ <listitem>
+ <para>
+ <literal>Com_stmt_reset</literal>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <literal>Com_stmt_prepare</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_execute</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_fetch</literal> (not available in
- versions before 5.0)
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_send_long_data</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_reset</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_close</literal>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_close</literal>
+ </para>
+ </listitem>
- </itemizedlist>
+ </itemizedlist>
+ <para>
Those variables stand for prepared statements commands.
Their names refer to the
<literal>COM_<replaceable>xxx</replaceable></literal>
@@ -10843,11 +10784,9 @@
The number of sorts that were done by scanning the table.
This variable was added in MySQL 3.23.25.
</para>
+ </listitem>
- <para>
<!-- TODO: add SSL status variables -->
- </para>
- </listitem>
<listitem>
<para>
@@ -13774,6 +13713,7 @@
<para>
Note: The netmask can only be used to tell the server to use
8, 16, 24, or 32 bits of the address, for example:
+ </para>
<programlisting>
192.0.0.0/255.0.0.0 (anything on the 192 class A network)
@@ -13782,12 +13722,13 @@
192.168.1.1 (only this specific IP)
</programlisting>
+ <para>
The following netmask (28 bits) will not work:
+ </para>
<programlisting>
192.168.0.1/255.255.255.240
</programlisting>
- </para>
</listitem>
<listitem>
@@ -17417,49 +17358,50 @@
<para>
Currently, yaSSL support is available for these platforms:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- Linux/x86-64 Red Hat Enterprise 3.0
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux/x86-64 Red Hat Enterprise 3.0
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux RHAS21 Itanium-2 with gcc, statically linked
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux RHAS21 Itanium-2 with gcc, statically linked
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux Itanium-2 with gcc
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux Itanium-2 with gcc
+ </para>
+ </listitem>
- <listitem>
- <para>
- Windows (all builds)
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Windows (all builds)
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
If you want to enable yaSSL when building MySQL from source,
you should configure MySQL like this:
+ </para>
<programlisting>
./configure --with-yassl=yes
</programlisting>
- </para>
<para>
To start the MySQL server with yaSSL support, use the same
options as with OpenSSL support and identify the certificates
needed to establish a secure connection:
+ </para>
<programlisting>
shell> <userinput>mysqld --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -17467,35 +17409,35 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--ssl-ca</option> identifies the Certificate
- Authority certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-ca</option> identifies the Certificate
+ Authority certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-cert</option> identifies the server
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-cert</option> identifies the server
+ certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-key</option> identifies the client
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-key</option> identifies the client
+ certificate.
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
To establish a secure connection to a MySQL server with yaSSL
support, start a client like this:
+ </para>
<programlisting>
shell> <userinput>mysql --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -17503,6 +17445,7 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
+ <para>
In other words, the options are the same as for the server,
and the Certificate Authority certificate has to be the same.
</para>
@@ -18879,20 +18822,20 @@
server is started. The option for enabling binary logging is
<option>--log-bin</option>. To determine the name of the current
binary log file, enter the following statement in MySQL:
+ </para>
<programlisting>
SHOW BINLOG EVENTS \G
</programlisting>
- </para>
<para>
If you prefer, you could enter the following from the command
line instead:
+ </para>
<programlisting>
mysql --user=<replaceable>root</replaceable> -p<replaceable>my_pwd</replaceable> -e 'SHOW BINLOG EVENTS \G'
</programlisting>
- </para>
<para>
Replace the password <replaceable>my_pwd</replaceable> with the
@@ -18913,12 +18856,12 @@
April 20, 2005) an SQL statement was executed which deleted a
large table. To restore the table and data, you could restore
the previous night's backup, and then enter the following:
+ </para>
<programlisting>
mysqlbinlog --stop-date="2005-04-20 9:59:59" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable>
</programlisting>
- </para>
<para>
This will recover all of the data up until the date and time
@@ -18929,12 +18872,12 @@
afterwards, as well. Based on this, you could run the
<command>mysqlbinlog</command> again with a start date and
time like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 10:01:00" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
In this line, the SQL statements logged from 10:01 a.m. will
@@ -18966,12 +18909,12 @@
range of times around when the unwanted transaction was
executed, but redirect the results to a text file for
examination. This can be done like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 9:55:00" --stop-date="2005-04-20 10:05:00" \
/var/log/mysql/bin.123456 > /tmp/mysql_restore.sql
</programlisting>
- </para>
<para>
This will create a small text file in the
@@ -18985,6 +18928,7 @@
After restoring the previous backup file, using the position
numbers, you would then enter something like the following
from the command-line:
+ </para>
<programlisting>
mysqlbinlog --stop-position="368312" /var/log/mysql/bin.123456 \
@@ -18993,7 +18937,6 @@
mysqlbinlog --start-position="368315" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
The first line above will recover all of the transactions up
@@ -24948,6 +24891,7 @@
about 40KB to allocate its structures. (The exact size depends
on architecture.) If you set the value too small, you'll get a
warning, like in this example:
+ </para>
<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
@@ -24969,7 +24913,6 @@
| query_cache_size | 41984 |
+------------------+-------+
</programlisting>
- </para>
<para>
If the query cache size is greater than 0, the
--- 1.9/refman-5.0/mysql-database-administration.xml 2005-08-15 13:27:10 -05:00
+++ 1.10/refman-5.0/mysql-database-administration.xml 2005-08-15 13:54:01 -05:00
@@ -5836,31 +5836,9 @@
</para>
</listitem>
-<!-- TODO: Document date_format and datetime_format. -->
+<!-- TODO: describe date_format when implemented -->
-<!--
- <listitem>
- <para><literal>date_format</literal></para>
-
- <para></para>
- </listitem>
-
- <listitem>
- <para><literal>datetime_format</literal></para>
-
- <para></para>
- </listitem>
--->
-
-<!-- TODO: Document div_precision_increment. -->
-
-<!--
- <listitem>
- <para><literal>div_precision_increment</literal></para>
-
- <para></para>
- </listitem>
--->
+<!-- TODO: describe datetime_format when implemented -->
<listitem>
<para>
@@ -6385,20 +6363,14 @@
<!-- TODO: also used on Windows for dir symlinking? -->
</para>
-
- <para>
-<!-- TODO: it may be that init_connect/init_slave should be discussed in -->
- </para>
-
- <para>
-<!-- a separate section that describes how to control client/slave startup. -->
- </para>
-
- <para>
-<!-- Move the examples to such a section if it is written. -->
- </para>
</listitem>
+<!--
+ TODO: it may be that init_connect/init_slave should be discussed
+ in a separate section that describes how to control client/slave
+ startup. Move the examples to such a section if this is done.
+-->
+
<listitem>
<para>
<literal>init_connect</literal>
@@ -6509,11 +6481,6 @@
complex join between several tables for which indexes are
not used, multiple join buffers might be necessary.
</para>
-
-<!--
- TODO: Make texi2html support index @anchor{Index cache size}. Then
- change some xrefs to point here
--->
</listitem>
<listitem>
@@ -7743,9 +7710,7 @@
<xref linkend="old-client"/>.
</para>
- <para>
<!-- TODO: this doesn't really belong here in a discussion of server variables -->
- </para>
<para>
When used as a client-side option, the client refuses to
@@ -8120,20 +8085,10 @@
this value. The default is large enough for normal
operation. See <xref linkend="mysql-benchmarks"/>.
</para>
-
- <para>
-<!-- TODO: uncomment when implemented -->
- </para>
-
- <para>
-<!-- @item time_format -->
- </para>
-
- <para>
-<!-- ADD DESCRIPTION -->
- </para>
</listitem>
+<!-- TODO: describe time_format when implemented -->
+
<listitem>
<para>
<literal>time_zone</literal>
@@ -9246,47 +9201,49 @@
The
<literal>Com_stmt_<replaceable>xxx</replaceable></literal>
status variables were added in 5.0.8:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <literal>Com_stmt_prepare</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_execute</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_fetch</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_send_long_data</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_reset</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>Com_stmt_close</literal>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_prepare</literal>
+ </para>
+ </listitem>
- </itemizedlist>
+ <listitem>
+ <para>
+ <literal>Com_stmt_execute</literal>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>Com_stmt_fetch</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_send_long_data</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_reset</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Com_stmt_close</literal>
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
Those variables stand for prepared statements commands.
Their names refer to the
<literal>COM_<replaceable>xxx</replaceable></literal>
@@ -10466,11 +10423,9 @@
<para>
The number of sorts that were done by scanning the table.
</para>
+ </listitem>
- <para>
<!-- TODO: add SSL status variables -->
- </para>
- </listitem>
<listitem>
<para>
@@ -13368,6 +13323,7 @@
<para>
Note: The netmask can only be used to tell the server to use
8, 16, 24, or 32 bits of the address, for example:
+ </para>
<programlisting>
192.0.0.0/255.0.0.0 (anything on the 192 class A network)
@@ -13376,12 +13332,13 @@
192.168.1.1 (only this specific IP)
</programlisting>
+ <para>
The following netmask (28 bits) will not work:
+ </para>
<programlisting>
192.168.0.1/255.255.255.240
</programlisting>
- </para>
</listitem>
<listitem>
@@ -16939,49 +16896,50 @@
<para>
Currently, yaSSL support is available for these platforms:
+ </para>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- Linux/x86-64 Red Hat Enterprise 3.0
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux/x86-64 Red Hat Enterprise 3.0
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux RHAS21 Itanium-2 with gcc, statically linked
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux RHAS21 Itanium-2 with gcc, statically linked
+ </para>
+ </listitem>
- <listitem>
- <para>
- Linux Itanium-2 with gcc
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Linux Itanium-2 with gcc
+ </para>
+ </listitem>
- <listitem>
- <para>
- Windows (all builds)
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Windows (all builds)
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
If you want to enable yaSSL when building MySQL from source,
you should configure MySQL like this:
+ </para>
<programlisting>
./configure --with-yassl=yes
</programlisting>
- </para>
<para>
To start the MySQL server with yaSSL support, use the same
options as with OpenSSL support and identify the certificates
needed to establish a secure connection:
+ </para>
<programlisting>
shell> <userinput>mysqld --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -16989,35 +16947,35 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--ssl-ca</option> identifies the Certificate
- Authority certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-ca</option> identifies the Certificate
+ Authority certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-cert</option> identifies the server
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-cert</option> identifies the server
+ certificate.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--ssl-key</option> identifies the client
- certificate.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--ssl-key</option> identifies the client
+ certificate.
+ </para>
+ </listitem>
- </itemizedlist>
- </para>
+ </itemizedlist>
<para>
To establish a secure connection to a MySQL server with yaSSL
support, start a client like this:
+ </para>
<programlisting>
shell> <userinput>mysql --ssl-ca=<replaceable>cacert.pem</replaceable> \
@@ -17025,6 +16983,7 @@
--ssl-key=<replaceable>server-key.pem</replaceable></userinput>
</programlisting>
+ <para>
In other words, the options are the same as for the server,
and the Certificate Authority certificate has to be the same.
</para>
@@ -18379,20 +18338,20 @@
server is started. The option for enabling binary logging is
<option>--log-bin</option>. To determine the name of the current
binary log file, enter the following statement in MySQL:
+ </para>
<programlisting>
SHOW BINLOG EVENTS \G
</programlisting>
- </para>
<para>
If you prefer, you could enter the following from the command
line instead:
+ </para>
<programlisting>
mysql --user=<replaceable>root</replaceable> -p<replaceable>my_pwd</replaceable> -e 'SHOW BINLOG EVENTS \G'
</programlisting>
- </para>
<para>
Replace the password <replaceable>my_pwd</replaceable> with the
@@ -18413,12 +18372,12 @@
April 20, 2005) an SQL statement was executed which deleted a
large table. To restore the table and data, you could restore
the previous night's backup, and then enter the following:
+ </para>
<programlisting>
mysqlbinlog --stop-date="2005-04-20 9:59:59" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable>
</programlisting>
- </para>
<para>
This will recover all of the data up until the date and time
@@ -18429,12 +18388,12 @@
afterwards, as well. Based on this, you could run the
<command>mysqlbinlog</command> again with a start date and
time like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 10:01:00" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
In this line, the SQL statements logged from 10:01 a.m. will
@@ -18466,12 +18425,12 @@
range of times around when the unwanted transaction was
executed, but redirect the results to a text file for
examination. This can be done like so:
+ </para>
<programlisting>
mysqlbinlog --start-date="2005-04-20 9:55:00" --stop-date="2005-04-20 10:05:00" \
/var/log/mysql/bin.123456 > /tmp/mysql_restore.sql
</programlisting>
- </para>
<para>
This will create a small text file in the
@@ -18485,6 +18444,7 @@
After restoring the previous backup file, using the position
numbers, you would then enter something like the following
from the command-line:
+ </para>
<programlisting>
mysqlbinlog --stop-position="368312" /var/log/mysql/bin.123456 \
@@ -18493,7 +18453,6 @@
mysqlbinlog --start-position="368315" /var/log/mysql/bin.123456 \
| mysql -u <replaceable>root</replaceable> -p<replaceable>mypwd</replaceable> \
</programlisting>
- </para>
<para>
The first line above will recover all of the transactions up
@@ -24222,6 +24181,7 @@
about 40KB to allocate its structures. (The exact size depends
on architecture.) If you set the value too small, you'll get a
warning, like in this example:
+ </para>
<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
@@ -24243,7 +24203,6 @@
| query_cache_size | 41984 |
+------------------+-------+
</programlisting>
- </para>
<para>
If the query cache size is greater than 0, the
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3281) | paul | 15 Aug |
