Author: paul
Date: 2006-10-06 17:55:15 +0200 (Fri, 06 Oct 2006)
New Revision: 3565
Log:
r10725@frost: paul | 2006-10-06 10:54:07 -0500
Undo (by commenting out) a disputed change pending resolution of the issue.
Modified:
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/replication.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14265
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10721
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14265
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10725
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-10-06 15:47:16 UTC (rev 3564)
+++ trunk/refman-5.0/database-administration.xml 2006-10-06 15:55:15 UTC (rev 3565)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 1067 bytes
@@ -6089,13 +6089,16 @@
to ensure that a slave server accepts updates only from
its master server and not from clients. As of MySQL
5.0.16, this variable does not apply to
- <literal>TEMPORARY</literal> tables. That is, DDL
+ <literal>TEMPORARY</literal> tables.
+<!--
+ That is, DDL
statements for temporary tables are allowed for
replication slave threads or users with the
<literal>SUPER</literal> privilege, effective with MySQL
5.0.16. Ordinary, non-<literal>root</literal> users may
still not do any writes, even to temporary tables, when
<literal>read_only</literal> is enabled.
+-->
</para>
</listitem>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-10-06 15:47:16 UTC (rev 3564)
+++ trunk/refman-5.0/replication.xml 2006-10-06 15:55:15 UTC (rev 3565)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 1031 bytes
@@ -2868,13 +2868,16 @@
or from users having the <literal>SUPER</literal> privilege.
This enables you to ensure that a slave server accepts no
updates from clients. As of MySQL 5.0.16, this option does not
- apply to <literal>TEMPORARY</literal> tables. That is, DDL
+ apply to <literal>TEMPORARY</literal> tables.
+<!--
+That is, DDL
statements for temporary tables are allowed for replication
slave threads or users with the <literal>SUPER</literal>
privilege, effective with MySQL 5.0.16. Ordinary,
non-<literal>root</literal> users may still not do any writes,
even to temporary tables, when <literal>read_only</literal> is
enabled.
+-->
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-10-06 15:47:16 UTC (rev 3564)
+++ trunk/refman-5.1/database-administration.xml 2006-10-06 15:55:15 UTC (rev 3565)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 1114 bytes
@@ -6103,13 +6103,16 @@
the <literal>SUPER</literal> privilege. This can be useful
to ensure that a slave server accepts updates only from
its master server and not from clients. This variable does
- not apply to <literal>TEMPORARY</literal> tables. That is,
+ not apply to <literal>TEMPORARY</literal> tables.
+<!--
+That is,
DDL statements for temporary tables are allowed for
replication slave threads or users with the
<literal>SUPER</literal> privilege, effective with MySQL
5.0.16. Ordinary, non-<literal>root</literal> users may
still not do any writes, even to temporary tables, when
<literal>read_only</literal> is enabled.
+-->
</para>
</listitem>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-10-06 15:47:16 UTC (rev 3564)
+++ trunk/refman-5.1/replication.xml 2006-10-06 15:55:15 UTC (rev 3565)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 1012 bytes
@@ -3082,13 +3082,16 @@
or from users having the <literal>SUPER</literal> privilege.
This enables you to ensure that a slave server accepts no
updates from clients. This option does not apply to
- <literal>TEMPORARY</literal> tables. That is, DDL statements
+ <literal>TEMPORARY</literal> tables.
+<!--
+That is, DDL statements
for temporary tables are allowed for replication slave threads
or users with the <literal>SUPER</literal> privilege,
effective with MySQL 5.0.16. Ordinary,
non-<literal>root</literal> users may still not do any writes,
even to temporary tables, when <literal>read_only</literal> is
enabled.
+-->
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3565 - in trunk: . refman-5.0 refman-5.1 | paul | 6 Oct |
