svn commit - mysqldoc@docsrva: r10693 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2008-05-08 18:55:19 +0200 (Thu, 08 May 2008)
New Revision: 10693

Log:
 r31248@frost:  paul | 2008-05-08 10:56:11 -0500
 events: general revisions


Modified:
   trunk/it/refman-5.1/events.xml
   trunk/pt/refman-5.1/events.xml
   trunk/refman-5.1/events.xml
   trunk/refman-6.0/events.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31247
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31182
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31248
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31182


Modified: trunk/it/refman-5.1/events.xml
===================================================================
--- trunk/it/refman-5.1/events.xml	2008-05-08 16:55:11 UTC (rev 10692)
+++ trunk/it/refman-5.1/events.xml	2008-05-08 16:55:19 UTC (rev 10693)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1676 bytes

@@ -1154,6 +1154,16 @@
       </itemizedlist>
 
       <para>
+        Beginning with MySQL 5.1.18, a third value may also appear in
+        place of <literal>ENABLED</literal> or
+        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
+        is set for the status of an event on a replication slave to
+        indicate that the event was created on the master and replicated
+        to the slave, but is not executed on the slave. See
+        <xref linkend="replication-features-invoked"/>.
+      </para>
+
+      <para>
         The <literal>ON SCHEDULE</literal> clause may use expressions
         involving built-in MySQL functions and user variables to obtain
         any of the <replaceable>timestamp</replaceable> or

@@ -1186,16 +1196,6 @@
       </para>
 
       <para>
-        Beginning with MySQL 5.1.18, a third value may also appear in
-        place of <literal>ENABLED</literal> or
-        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
-        is set for the status of an event on a replication slave to
-        indicate that the event was created on the master and replicated
-        to the slave, but is not executed on the slave. See
-        <xref linkend="replication-features-invoked"/>.
-      </para>
-
-      <para>
         You may supply a comment for an event using a
         <literal>COMMENT</literal> clause.
         <replaceable>comment</replaceable> may be any string of up to 64


Modified: trunk/pt/refman-5.1/events.xml
===================================================================
--- trunk/pt/refman-5.1/events.xml	2008-05-08 16:55:11 UTC (rev 10692)
+++ trunk/pt/refman-5.1/events.xml	2008-05-08 16:55:19 UTC (rev 10693)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1676 bytes

@@ -1154,6 +1154,16 @@
       </itemizedlist>
 
       <para>
+        Beginning with MySQL 5.1.18, a third value may also appear in
+        place of <literal>ENABLED</literal> or
+        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
+        is set for the status of an event on a replication slave to
+        indicate that the event was created on the master and replicated
+        to the slave, but is not executed on the slave. See
+        <xref linkend="replication-features-invoked"/>.
+      </para>
+
+      <para>
         The <literal>ON SCHEDULE</literal> clause may use expressions
         involving built-in MySQL functions and user variables to obtain
         any of the <replaceable>timestamp</replaceable> or

@@ -1186,16 +1196,6 @@
       </para>
 
       <para>
-        Beginning with MySQL 5.1.18, a third value may also appear in
-        place of <literal>ENABLED</literal> or
-        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
-        is set for the status of an event on a replication slave to
-        indicate that the event was created on the master and replicated
-        to the slave, but is not executed on the slave. See
-        <xref linkend="replication-features-invoked"/>.
-      </para>
-
-      <para>
         You may supply a comment for an event using a
         <literal>COMMENT</literal> clause.
         <replaceable>comment</replaceable> may be any string of up to 64


Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml	2008-05-08 16:55:11 UTC (rev 10692)
+++ trunk/refman-5.1/events.xml	2008-05-08 16:55:19 UTC (rev 10693)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1667 bytes

@@ -1154,6 +1154,16 @@
       </itemizedlist>
 
       <para>
+        Beginning with MySQL 5.1.18, a third value may also appear in
+        place of <literal>ENABLED</literal> or
+        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
+        is set for the status of an event on a replication slave to
+        indicate that the event was created on the master and replicated
+        to the slave, but is not executed on the slave. See
+        <xref linkend="replication-features-invoked"/>.
+      </para>
+
+      <para>
         The <literal>ON SCHEDULE</literal> clause may use expressions
         involving built-in MySQL functions and user variables to obtain
         any of the <replaceable>timestamp</replaceable> or

@@ -1186,16 +1196,6 @@
       </para>
 
       <para>
-        Beginning with MySQL 5.1.18, a third value may also appear in
-        place of <literal>ENABLED</literal> or
-        <literal>DISABLED</literal>; <literal>DISABLE ON
SLAVE</literal>
-        is set for the status of an event on a replication slave to
-        indicate that the event was created on the master and replicated
-        to the slave, but is not executed on the slave. See
-        <xref linkend="replication-features-invoked"/>.
-      </para>
-
-      <para>
         You may supply a comment for an event using a
         <literal>COMMENT</literal> clause.
         <replaceable>comment</replaceable> may be any string of up to 64


Modified: trunk/refman-6.0/events.xml
===================================================================
--- trunk/refman-6.0/events.xml	2008-05-08 16:55:11 UTC (rev 10692)
+++ trunk/refman-6.0/events.xml	2008-05-08 16:55:19 UTC (rev 10693)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 13; 1882 bytes

@@ -658,6 +658,19 @@
 </programlisting>
 
       <para>
+        A third value may also appear in place of
+        <literal>ENABLED</literal> or
<literal>DISABLED</literal>;
+        <literal>DISABLE ON SLAVE</literal> is used on a replication
+        slave to indicate an event which was created on the master and
+        replicated to the slave, but which is not executed on the slave.
+        Normally, <literal>DISABLE ON SLAVE</literal> is set
+        automatically as required; however, there are some circumstances
+        under which you may want or need to change it manually. See
+        <xref linkend="replication-features-invoked"/>, for more
+        information.
+      </para>
+
+      <para>
         The <literal>ON SCHEDULE</literal> clause may use expressions
         involving built-in MySQL functions and user variables to obtain
         any of the <replaceable>timestamp</replaceable> or

@@ -716,19 +729,6 @@
         </para>
       </note>
 
-      <para>
-        A third value may also appear in place of
-        <literal>ENABLED</literal> or
<literal>DISABLED</literal>;
-        <literal>DISABLE ON SLAVE</literal> is used on a replication
-        slave to indicate an event which was created on the master and
-        replicated to the slave, but which is not executed on the slave.
-        Normally, <literal>DISABLE ON SLAVE</literal> is set
-        automatically as required; however, there are some circumstances
-        under which you may want or need to change it manually. See
-        <xref linkend="replication-features-invoked"/>, for more
-        information.
-      </para>
-
     </section>
 
     <section id="create-event">