Author: paul
Date: 2007-12-19 19:07:59 +0100 (Wed, 19 Dec 2007)
New Revision: 9401
Log:
r28294@frost: paul | 2007-12-19 12:05:21 -0600
Some general FLUSH revisions.
Modified:
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34416
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28293
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34416
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28294
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-12-19 18:07:49 UTC (rev 9400)
+++ trunk/refman-4.1/sql-syntax.xml 2007-12-19 18:07:59 UTC (rev 9401)
Changed blocks: 7, Lines Added: 32, Lines Deleted: 31; 6031 bytes
@@ -17927,9 +17927,9 @@
successively for a given host while connecting to the
MySQL server, MySQL assumes that something is wrong and
blocks the host from further connection requests. Flushing
- the host tables allows the host to attempt to connect
- again. See <xref linkend="blocked-host"/>. You can start
- <command>mysqld</command> with
+ the host tables enables further connection attempts from
+ the host. See <xref linkend="blocked-host"/>. You can
+ start <command>mysqld</command> with
<option>--max_connect_errors=999999999</option> to avoid
this error message.
</para>
@@ -17967,13 +17967,14 @@
</para>
<para>
- Beginning with MySQL 4.0.10, if the server was started
- with the <option>--log-error</option> option,
+ Beginning with MySQL 4.0.10, example, if it was started
+ with the <option>--log-error</option> option),
<literal>FLUSH LOGS</literal> causes it to rename the
current error log file with a suffix of
<literal>-old</literal> and create a new empty log file.
- No renaming occurs if the <option>--log-error</option>
- option was not given.
+ No renaming occurs if the server is not writing to a named
+ file (for example, if it is writing errors to the
+ console).
</para>
</listitem>
@@ -18008,8 +18009,8 @@
<para>
Defragment the query cache to better utilize its memory.
<literal>FLUSH QUERY CACHE</literal> does not remove any
- queries from the cache, unlike <literal>RESET QUERY
- CACHE</literal>.
+ queries from the cache, unlike <literal>FLUSH
+ TABLES</literal> or <literal>RESET QUERY CACHE</literal>.
</para>
</listitem>
@@ -18051,11 +18052,11 @@
<para>
When no tables are named, closes all open tables and
- forces all tables in use to be closed. This also flushes
- the query cache. With one or more table names, flushes
- only the given tables. <literal>FLUSH TABLES</literal>
- also removes all query results from the query cache, like
- the <literal>RESET QUERY CACHE</literal> statement.
+ forces all tables in use to be closed. With one or more
+ table names, flushes only the given tables. <literal>FLUSH
+ TABLES</literal> also removes all query results from the
+ query cache, like the <literal>RESET QUERY CACHE</literal>
+ statement.
</para>
</listitem>
@@ -18085,13 +18086,13 @@
<listitem>
<para>
- <literal>UNLOCK TABLES</literal> commits a transaction
- only if any tables currently have been locked with
- <literal>LOCK TABLES</literal>. This does not occur
- for <literal>UNLOCK TABLES</literal> following
- <literal>FLUSH TABLES WITH READ LOCK</literal> because
- the latter statement does not acquire table-level
- locks.
+ <literal>UNLOCK TABLES</literal> implicitly commits
+ any active transaction only if any tables currently
+ have been locked with <literal>LOCK TABLES</literal>.
+ The commit does not occur for <literal>UNLOCK
+ TABLES</literal> following <literal>FLUSH TABLES WITH
+ READ LOCK</literal> because the latter statement does
+ not acquire table locks.
</para>
</listitem>
@@ -18130,25 +18131,31 @@
Before MySQL 4.1.1, <literal>FLUSH</literal> statements are
not written to the binary log. As of MySQL 4.1.1,
<literal>FLUSH</literal> statements are written to the binary
- log so that such statements used on a MySQL server acting as a
+ log. Such statements used on a MySQL server acting as a
replication master will be replicated to replication slaves.
Logging can be suppressed with the optional
<literal>NO_WRITE_TO_BINLOG</literal> keyword or its alias
<literal>LOCAL</literal>.
</para>
+ <para>
+ See also <xref linkend="reset"/>, for information about how
+ the <literal>RESET</literal> statement is used with
+ replication.
+ </para>
+
<note>
<para>
<literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
<literal>FLUSH TABLES WITH READ LOCK</literal> are not
- logged in any case because they would cause problems if
- replicated to a slave.
+ written to the binary log in any case because they would
+ cause problems if replicated to a slave.
</para>
</note>
<para>
- You can also access some of these statements with the
+ You can perform some flush operations with the
<command>mysqladmin</command> utility, using the
<literal>flush-hosts</literal>, <literal>flush-logs</literal>,
<literal>flush-privileges</literal>,
@@ -18156,12 +18163,6 @@
<literal>flush-tables</literal> commands.
</para>
- <para>
- See also <xref linkend="reset"/>, for information about how
- the <literal>RESET</literal> statement is used with
- replication.
- </para>
-
</section>
<section id="kill">
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-12-19 18:07:49 UTC (rev 9400)
+++ trunk/refman-5.0/sql-syntax.xml 2007-12-19 18:07:59 UTC (rev 9401)
Changed blocks: 7, Lines Added: 37, Lines Deleted: 35; 6204 bytes
@@ -21017,9 +21017,9 @@
successively for a given host while connecting to the
MySQL server, MySQL assumes that something is wrong and
blocks the host from further connection requests. Flushing
- the host tables allows the host to attempt to connect
- again. See <xref linkend="blocked-host"/>. You can start
- <command>mysqld</command> with
+ the host tables enables further connection attempts from
+ the host. See <xref linkend="blocked-host"/>. You can
+ start <command>mysqld</command> with
<option>--max_connect_errors=999999999</option> to avoid
this error message.
</para>
@@ -21054,12 +21054,14 @@
</para>
<para>
- If the server was started with the
- <option>--log-error</option> option, <literal>FLUSH
+ If the server is writing error output to a named file (for
+ example, if it was started with the
+ <option>--log-error</option> option), <literal>FLUSH
LOGS</literal> causes it to rename the current error log
file with a suffix of <literal>-old</literal> and create a
- new empty log file. No renaming occurs if the
- <option>--log-error</option> option was not given.
+ new empty log file. No renaming occurs if the server is
+ not writing to a named file (for example, if it is writing
+ errors to the console).
</para>
</listitem>
@@ -21094,8 +21096,8 @@
<para>
Defragment the query cache to better utilize its memory.
<literal>FLUSH QUERY CACHE</literal> does not remove any
- queries from the cache, unlike <literal>RESET QUERY
- CACHE</literal>.
+ queries from the cache, unlike <literal>FLUSH
+ TABLES</literal> or <literal>RESET QUERY CACHE</literal>.
</para>
</listitem>
@@ -21142,11 +21144,11 @@
<para>
When no tables are named, closes all open tables and
- forces all tables in use to be closed. This also flushes
- the query cache. With one or more table names, flushes
- only the given tables. <literal>FLUSH TABLES</literal>
- also removes all query results from the query cache, like
- the <literal>RESET QUERY CACHE</literal> statement.
+ forces all tables in use to be closed. With one or more
+ table names, flushes only the given tables. <literal>FLUSH
+ TABLES</literal> also removes all query results from the
+ query cache, like the <literal>RESET QUERY CACHE</literal>
+ statement.
</para>
</listitem>
@@ -21176,13 +21178,13 @@
<listitem>
<para>
- <literal>UNLOCK TABLES</literal> commits a transaction
- only if any tables currently have been locked with
- <literal>LOCK TABLES</literal>. This does not occur
- for <literal>UNLOCK TABLES</literal> following
- <literal>FLUSH TABLES WITH READ LOCK</literal> because
- the latter statement does not acquire table-level
- locks.
+ <literal>UNLOCK TABLES</literal> implicitly commits
+ any active transaction only if any tables currently
+ have been locked with <literal>LOCK TABLES</literal>.
+ The commit does not occur for <literal>UNLOCK
+ TABLES</literal> following <literal>FLUSH TABLES WITH
+ READ LOCK</literal> because the latter statement does
+ not acquire table locks.
</para>
</listitem>
@@ -21219,25 +21221,31 @@
<para>
By default, <literal>FLUSH</literal> statements are written to
- the binary log so that such statements used on a MySQL server
- acting as a replication master will be replicated to
- replication slaves. Logging can be suppressed with the
- optional <literal>NO_WRITE_TO_BINLOG</literal> keyword or its
- alias <literal>LOCAL</literal>.
+ the binary log. Such statements used on a MySQL server acting
+ as a replication master will be replicated to replication
+ slaves. Logging can be suppressed with the optional
+ <literal>NO_WRITE_TO_BINLOG</literal> keyword or its alias
+ <literal>LOCAL</literal>.
</para>
+ <para>
+ See also <xref linkend="reset"/>, for information about how
+ the <literal>RESET</literal> statement is used with
+ replication.
+ </para>
+
<note>
<para>
<literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
<literal>FLUSH TABLES WITH READ LOCK</literal> are not
- logged in any case because they would cause problems if
- replicated to a slave.
+ written to the binary log in any case because they would
+ cause problems if replicated to a slave.
</para>
</note>
<para>
- You can also access some of these statements with the
+ You can perform some flush operations with the
<command>mysqladmin</command> utility, using the
<literal>flush-hosts</literal>, <literal>flush-logs</literal>,
<literal>flush-privileges</literal>,
@@ -21254,12 +21262,6 @@
<xref linkend="routine-restrictions"/>.
</para>
- <para>
- See also <xref linkend="reset"/>, for information about how
- the <literal>RESET</literal> statement is used with
- replication.
- </para>
-
</section>
<section id="kill">
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-12-19 18:07:49 UTC (rev 9400)
+++ trunk/refman-5.1/sql-syntax.xml 2007-12-19 18:07:59 UTC (rev 9401)
Changed blocks: 7, Lines Added: 37, Lines Deleted: 35; 6172 bytes
@@ -23736,9 +23736,9 @@
successively for a given host while connecting to the
MySQL server, MySQL assumes that something is wrong and
blocks the host from further connection requests. Flushing
- the host tables allows the host to attempt to connect
- again. See <xref linkend="blocked-host"/>. You can start
- <command>mysqld</command> with
+ the host tables enables further connection attempts from
+ the host. See <xref linkend="blocked-host"/>. You can
+ start <command>mysqld</command> with
<option>--max_connect_errors=999999999</option> to avoid
this error message.
</para>
@@ -23773,12 +23773,14 @@
</para>
<para>
- If the server was started with the
- <option>--log-error</option> option, <literal>FLUSH
+ If the server is writing error output to a named file (for
+ example, if it was started with the
+ <option>--log-error</option> option), <literal>FLUSH
LOGS</literal> causes it to rename the current error log
file with a suffix of <literal>-old</literal> and create a
- new empty log file. No renaming occurs if the
- <option>--log-error</option> option was not given.
+ new empty log file. No renaming occurs if the server is
+ not writing to a named file (for example, if it is writing
+ errors to the console).
</para>
</listitem>
@@ -23813,8 +23815,8 @@
<para>
Defragment the query cache to better utilize its memory.
<literal>FLUSH QUERY CACHE</literal> does not remove any
- queries from the cache, unlike <literal>RESET QUERY
- CACHE</literal>.
+ queries from the cache, unlike <literal>FLUSH
+ TABLES</literal> or <literal>RESET QUERY CACHE</literal>.
</para>
</listitem>
@@ -23861,11 +23863,11 @@
<para>
When no tables are named, closes all open tables and
- forces all tables in use to be closed. This also flushes
- the query cache. With one or more table names, flushes
- only the given tables. <literal>FLUSH TABLES</literal>
- also removes all query results from the query cache, like
- the <literal>RESET QUERY CACHE</literal> statement.
+ forces all tables in use to be closed. With one or more
+ table names, flushes only the given tables. <literal>FLUSH
+ TABLES</literal> also removes all query results from the
+ query cache, like the <literal>RESET QUERY CACHE</literal>
+ statement.
</para>
</listitem>
@@ -23895,13 +23897,13 @@
<listitem>
<para>
- <literal>UNLOCK TABLES</literal> commits a transaction
- only if any tables currently have been locked with
- <literal>LOCK TABLES</literal>. This does not occur
- for <literal>UNLOCK TABLES</literal> following
- <literal>FLUSH TABLES WITH READ LOCK</literal> because
- the latter statement does not acquire table-level
- locks.
+ <literal>UNLOCK TABLES</literal> implicitly commits
+ any active transaction only if any tables currently
+ have been locked with <literal>LOCK TABLES</literal>.
+ The commit does not occur for <literal>UNLOCK
+ TABLES</literal> following <literal>FLUSH TABLES WITH
+ READ LOCK</literal> because the latter statement does
+ not acquire table locks.
</para>
</listitem>
@@ -23938,25 +23940,31 @@
<para>
By default, <literal>FLUSH</literal> statements are written to
- the binary log so that such statements used on a MySQL server
- acting as a replication master will be replicated to
- replication slaves. Logging can be suppressed with the
- optional <literal>NO_WRITE_TO_BINLOG</literal> keyword or its
- alias <literal>LOCAL</literal>.
+ the binary log. Such statements used on a MySQL server acting
+ as a replication master will be replicated to replication
+ slaves. Logging can be suppressed with the optional
+ <literal>NO_WRITE_TO_BINLOG</literal> keyword or its alias
+ <literal>LOCAL</literal>.
</para>
+ <para>
+ See also <xref linkend="reset"/>, for information about how
+ the <literal>RESET</literal> statement is used with
+ replication.
+ </para>
+
<note>
<para>
<literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
<literal>FLUSH TABLES WITH READ LOCK</literal> are not
- logged in any case because they would cause problems if
- replicated to a slave.
+ written to the binary log in any case because they would
+ cause problems if replicated to a slave.
</para>
</note>
<para>
- You can also access some of these statements with the
+ You can perform some flush operations with the
<command>mysqladmin</command> utility, using the
<literal>flush-hosts</literal>, <literal>flush-logs</literal>,
<literal>flush-privileges</literal>,
@@ -23975,12 +23983,6 @@
</para>
</note>
- <para>
- See also <xref linkend="reset"/>, for information about how
- the <literal>RESET</literal> statement is used with
- replication.
- </para>
-
</section>
<section id="kill">
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2007-12-19 18:07:49 UTC (rev 9400)
+++ trunk/refman-6.0/sql-syntax.xml 2007-12-19 18:07:59 UTC (rev 9401)
Changed blocks: 7, Lines Added: 37, Lines Deleted: 35; 6172 bytes
@@ -23996,9 +23996,9 @@
successively for a given host while connecting to the
MySQL server, MySQL assumes that something is wrong and
blocks the host from further connection requests. Flushing
- the host tables allows the host to attempt to connect
- again. See <xref linkend="blocked-host"/>. You can start
- <command>mysqld</command> with
+ the host tables enables further connection attempts from
+ the host. See <xref linkend="blocked-host"/>. You can
+ start <command>mysqld</command> with
<option>--max_connect_errors=999999999</option> to avoid
this error message.
</para>
@@ -24033,12 +24033,14 @@
</para>
<para>
- If the server was started with the
- <option>--log-error</option> option, <literal>FLUSH
+ If the server is writing error output to a named file (for
+ example, if it was started with the
+ <option>--log-error</option> option), <literal>FLUSH
LOGS</literal> causes it to rename the current error log
file with a suffix of <literal>-old</literal> and create a
- new empty log file. No renaming occurs if the
- <option>--log-error</option> option was not given.
+ new empty log file. No renaming occurs if the server is
+ not writing to a named file (for example, if it is writing
+ errors to the console).
</para>
</listitem>
@@ -24073,8 +24075,8 @@
<para>
Defragment the query cache to better utilize its memory.
<literal>FLUSH QUERY CACHE</literal> does not remove any
- queries from the cache, unlike <literal>RESET QUERY
- CACHE</literal>.
+ queries from the cache, unlike <literal>FLUSH
+ TABLES</literal> or <literal>RESET QUERY CACHE</literal>.
</para>
</listitem>
@@ -24121,11 +24123,11 @@
<para>
When no tables are named, closes all open tables and
- forces all tables in use to be closed. This also flushes
- the query cache. With one or more table names, flushes
- only the given tables. <literal>FLUSH TABLES</literal>
- also removes all query results from the query cache, like
- the <literal>RESET QUERY CACHE</literal> statement.
+ forces all tables in use to be closed. With one or more
+ table names, flushes only the given tables. <literal>FLUSH
+ TABLES</literal> also removes all query results from the
+ query cache, like the <literal>RESET QUERY CACHE</literal>
+ statement.
</para>
</listitem>
@@ -24155,13 +24157,13 @@
<listitem>
<para>
- <literal>UNLOCK TABLES</literal> commits a transaction
- only if any tables currently have been locked with
- <literal>LOCK TABLES</literal>. This does not occur
- for <literal>UNLOCK TABLES</literal> following
- <literal>FLUSH TABLES WITH READ LOCK</literal> because
- the latter statement does not acquire table-level
- locks.
+ <literal>UNLOCK TABLES</literal> implicitly commits
+ any active transaction only if any tables currently
+ have been locked with <literal>LOCK TABLES</literal>.
+ The commit does not occur for <literal>UNLOCK
+ TABLES</literal> following <literal>FLUSH TABLES WITH
+ READ LOCK</literal> because the latter statement does
+ not acquire table locks.
</para>
</listitem>
@@ -24198,25 +24200,31 @@
<para>
By default, <literal>FLUSH</literal> statements are written to
- the binary log so that such statements used on a MySQL server
- acting as a replication master will be replicated to
- replication slaves. Logging can be suppressed with the
- optional <literal>NO_WRITE_TO_BINLOG</literal> keyword or its
- alias <literal>LOCAL</literal>.
+ the binary log. Such statements used on a MySQL server acting
+ as a replication master will be replicated to replication
+ slaves. Logging can be suppressed with the optional
+ <literal>NO_WRITE_TO_BINLOG</literal> keyword or its alias
+ <literal>LOCAL</literal>.
</para>
+ <para>
+ See also <xref linkend="reset"/>, for information about how
+ the <literal>RESET</literal> statement is used with
+ replication.
+ </para>
+
<note>
<para>
<literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
<literal>FLUSH TABLES WITH READ LOCK</literal> are not
- logged in any case because they would cause problems if
- replicated to a slave.
+ written to the binary log in any case because they would
+ cause problems if replicated to a slave.
</para>
</note>
<para>
- You can also access some of these statements with the
+ You can perform some flush operations with the
<command>mysqladmin</command> utility, using the
<literal>flush-hosts</literal>, <literal>flush-logs</literal>,
<literal>flush-privileges</literal>,
@@ -24235,12 +24243,6 @@
</para>
</note>
- <para>
- See also <xref linkend="reset"/>, for information about how
- the <literal>RESET</literal> statement is used with
- replication.
- </para>
-
</section>
<section id="kill">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9401 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 19 Dec |
