Author: paul
Date: 2008-01-08 18:48:14 +0100 (Tue, 08 Jan 2008)
New Revision: 9513
Log:
r23196@kite-hub: paul | 2008-01-08 10:45:21 -0600
Minor read_only revisions.
Modified:
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34586
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28489
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:23195
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34586
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28489
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:23196
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-01-08 17:48:01 UTC (rev 9512)
+++ trunk/refman-4.1/dba-core.xml 2008-01-08 17:48:14 UTC (rev 9513)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 647 bytes
@@ -5637,7 +5637,7 @@
</para>
<para>
- When this variable is set to <literal>ON</literal>, the
+ This variable is off by default. When it is enabled, the
server allows no updates except from users that have the
<literal>SUPER</literal> privilege or (on a slave server)
from updates performed by slave threads. On a slave server,
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-01-08 17:48:01 UTC (rev 9512)
+++ trunk/refman-5.0/dba-core.xml 2008-01-08 17:48:14 UTC (rev 9513)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 707 bytes
@@ -6727,7 +6727,7 @@
<para condition="dynamic:optvar:item" role="5.0:mysqld:read_only"/>
<para>
- When this variable is set to <literal>ON</literal>, the
+ This variable is off by default. When it is enabled, the
server allows no updates except from users that have the
<literal>SUPER</literal> privilege or (on a slave server)
from updates performed by slave threads. On a slave server,
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-01-08 17:48:01 UTC (rev 9512)
+++ trunk/refman-5.1/dba-core.xml 2008-01-08 17:48:14 UTC (rev 9513)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 22; 2672 bytes
@@ -7163,7 +7163,7 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:read_only"/>
<para>
- When this variable is set to <literal>ON</literal>, the
+ This variable is off by default. When it is enabled, the
server allows no updates except from users that have the
<literal>SUPER</literal> privilege or (on a slave server)
from updates performed by slave threads. On a slave server,
@@ -7192,19 +7192,19 @@
<para>
If you attempt to enable <literal>read_only</literal>
while you have any explicit locks (acquired with
- <literal>LOCK TABLES</literal> or have a pending
- transaction, an error will occur.
+ <literal>LOCK TABLES</literal>) or have a pending
+ transaction, an error occurs.
</para>
</listitem>
<listitem>
<para>
- If other clients hold explicit table locks or have
- pending transactions, the attempt to enable
- <literal>read_only</literal> blocks until the locks are
- released and the transactions end. While the attempt to
- enable <literal>read_only</literal> is pending, requests
- by other clients for table locks or to begin
+ If you attempt to enable <literal>read_only</literal>
+ while other clients hold explicit table locks or have
+ pending transactions, the attempt blocks until the locks
+ are released and the transactions end. While the attempt
+ to enable <literal>read_only</literal> is pending,
+ requests by other clients for table locks or to begin
transactions also block until
<literal>read_only</literal> has been set.
</para>
@@ -7217,19 +7217,6 @@
TABLES WITH READ LOCK</literal>) because that does not
involve table locks.
</para>
-
-<!--
- This means that the following
- sequence of statements can be used to place a server
- in read-only state prior to performing a backup:
- </para>
-
-<programlisting>
-FLUSH TABLES WITH READ LOCK;
-SET GLOBAL read_only = ON;
-UNLOCK TABLES;
-</programlisting>
--->
</listitem>
</itemizedlist>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-01-08 17:48:01 UTC (rev 9512)
+++ trunk/refman-6.0/dba-core.xml 2008-01-08 17:48:14 UTC (rev 9513)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 22; 2672 bytes
@@ -6886,7 +6886,7 @@
<para condition="dynamic:optvar:item" role="6.0:mysqld:read_only"/>
<para>
- When this variable is set to <literal>ON</literal>, the
+ This variable is off by default. When it is enabled, the
server allows no updates except from users that have the
<literal>SUPER</literal> privilege or (on a slave server)
from updates performed by slave threads. On a slave server,
@@ -6915,19 +6915,19 @@
<para>
If you attempt to enable <literal>read_only</literal>
while you have any explicit locks (acquired with
- <literal>LOCK TABLES</literal> or have a pending
- transaction, an error will occur.
+ <literal>LOCK TABLES</literal>) or have a pending
+ transaction, an error occurs.
</para>
</listitem>
<listitem>
<para>
- If other clients hold explicit table locks or have
- pending transactions, the attempt to enable
- <literal>read_only</literal> blocks until the locks are
- released and the transactions end. While the attempt to
- enable <literal>read_only</literal> is pending, requests
- by other clients for table locks or to begin
+ If you attempt to enable <literal>read_only</literal>
+ while other clients hold explicit table locks or have
+ pending transactions, the attempt blocks until the locks
+ are released and the transactions end. While the attempt
+ to enable <literal>read_only</literal> is pending,
+ requests by other clients for table locks or to begin
transactions also block until
<literal>read_only</literal> has been set.
</para>
@@ -6940,19 +6940,6 @@
TABLES WITH READ LOCK</literal>) because that does not
involve table locks.
</para>
-
-<!--
- This means that the following
- sequence of statements can be used to place a server
- in read-only state prior to performing a backup:
- </para>
-
-<programlisting>
-FLUSH TABLES WITH READ LOCK;
-SET GLOBAL read_only = ON;
-UNLOCK TABLES;
-</programlisting>
--->
</listitem>
</itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9513 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 8 Jan |
