Author: jstephens
Date: 2006-02-16 11:30:08 +0100 (Thu, 16 Feb 2006)
New Revision: 1344
Log:
Additional PeterG Events fixes.
Modified:
trunk/refman-5.1/events.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/sql-syntax.xml
Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml 2006-02-16 08:38:47 UTC (rev 1343)
+++ trunk/refman-5.1/events.xml 2006-02-16 10:30:08 UTC (rev 1344)
@@ -164,11 +164,11 @@
Users can create, modify, and drop scheduled events using SQL
statements intended for these purposes. Syntactically invalid
event creation and modification statements fail with an
- appropriate error message. Note that a user may include
+ appropriate error message. <emphasis>A user may include
statements in an event's action which require privileges that
- the user does not actually have. The event creation or
- modification statement succeeds but the event's action fails.
- See <xref linkend="events-privileges"/> for details.
+ the user does not actually have</emphasis>. The event creation
+ or modification statement succeeds but the event's action
+ fails. See <xref linkend="events-privileges"/> for details.
</para>
</listitem>
@@ -336,9 +336,9 @@
When a scheduled event is no longer wanted or needed, it can
be deleted from the server by its definer using the
<literal>DROP EVENT</literal> statement. See
- <xref linkend="events-drop"/>. (Note that whether an event
- persists past the end of its schedule also depends on its
- <literal>ON COMPLETION</literal> clause, if it has one. See
+ <xref linkend="events-drop"/>. (Whether an event persists past
+ the end of its schedule also depends on its <literal>ON
+ COMPLETION</literal> clause, if it has one. See
<xref linkend="events-create"/>.)
</para>
@@ -360,7 +360,7 @@
CREATE EVENT [IF NOT EXISTS] <replaceable>event_name</replaceable>
ON SCHEDULE <replaceable>schedule</replaceable>
[ON COMPLETION [NOT] PRESERVE]
- [ENABLED | DISABLE]
+ [ENABLE | DISABLE]
[COMMENT '<replaceable>comment</replaceable>']
DO <replaceable>sql_statement</replaceable>;
@@ -442,9 +442,14 @@
If no schema is indicated as part of
<replaceable>event_name</replaceable>, then the default
(current) schema is assumed. The definer is always the current
- MySQL user. <emphasis>Note that is it possible for two different
- users to create different events having the same name on the
- same database schema</emphasis>.
+ MySQL user. <emphasis>It is possible for two different users to
+ create different events having the same name on the same
+ database schema</emphasis>. For example, the users
+ <literal>jon@ghidora</literal> and
+ <literal>stefan@athena</literal> may each create an event named
+ <literal>myevent</literal> on the database schema named
+ <literal>myschema</literal>. These are entirely different
+ events.
</para>
<para>
@@ -506,9 +511,9 @@
</programlisting>
<para>
- Note that <literal>CREATE EVENT</literal> statements which
- are invalid — for whatever reason — fail with an
- error.
+ <literal>CREATE EVENT</literal> statements which are
+ themselves invalid — for whatever reason — fail
+ with an error.
</para>
<para>
@@ -528,9 +533,9 @@
parts, a quantity and a unit of time, and follows the same
syntax rules that govern intervals used in the
<literal>DATE_ADD()</literal> function (see
- <xref linkend="date-and-time-functions"/>. Note that the
- units keywords are also the same, except that you cannot use
- any units involving microseconds when defining an event.
+ <xref linkend="date-and-time-functions"/>. The units
+ keywords are also the same, except that you cannot use any
+ units involving microseconds when defining an event.
</para>
<remark role="note">
@@ -550,14 +555,14 @@
<listitem>
<para>
For actions which are to be repeated at a regular interval,
- you can use an <literal>EVERY</literal> clause. The EVERY
- keyword is followed by an
+ you can use an <literal>EVERY</literal> clause. The
+ <literal>EVERY</literal> keyword is followed by an
<replaceable>interval</replaceable> as described in the
previous dicussion of the <literal>AT</literal> keyword.
- (Note that <literal>+ INTERVAL</literal> is
- <emphasis>not</emphasis> used with
- <literal>EVERY</literal>.) For example, <literal>EVERY 6
- WEEK</literal> means <quote>every six weeks</quote>.
+ (<literal>+ INTERVAL</literal> is <emphasis>not</emphasis>
+ used with <literal>EVERY</literal>.) For example,
+ <literal>EVERY 6 WEEK</literal> means <quote>every six
+ weeks</quote>.
</para>
<para>
@@ -613,7 +618,7 @@
</para>
<para>
- Note that you may use <literal>STARTS</literal>,
+ You may use <literal>STARTS</literal>,
<literal>ENDS</literal>, both, or neither in an
<literal>EVERY</literal> clause.
</para>
@@ -632,7 +637,7 @@
<para>
You can create an event but keep it from being active using the
<literal>DISABLE</literal> keyword. Alternatively, you may use
- <literal>ENABLED</literal> to make explicit the default status,
+ <literal>ENABLE</literal> to make explicit the default status,
which is active. This is most useful in conjunction with
<literal>ALTER EVENT</literal> (see
<xref linkend="events-alter"/>).
@@ -765,9 +770,9 @@
Generally, any statements which are valid in stored routines may
be used for action statements executed by events. For more
information about statements allowable within stored routines,
- see <xref linkend="stored-procedure-syntax"/>. Note that you can
- create an event as part of a stored routine, but an event cannot
- be created by another event.
+ see <xref linkend="stored-procedure-syntax"/>. You can create an
+ event as part of a stored routine, but an event cannot be
+ created by another event.
</para>
</section>
@@ -782,7 +787,7 @@
[RENAME TO <replaceable>new_event_name</replaceable>]
[ON COMPLETION [NOT] PRESERVE]
[COMMENT '<replaceable>comment</replaceable>']
- [ENABLED | DISABLE]
+ [ENABLE | DISABLE]
[DO <replaceable>sql_statement</replaceable>]
</programlisting>
@@ -872,8 +877,8 @@
<para>
The previous statement renames the event
<literal>myevent</literal> to <literal>yourevent</literal>.
- (Note that there is no <literal>RENAME EVENT</literal>
- statement.)
+ (<emphasis role="bold">Note</emphasis>: There is no
+ <literal>RENAME EVENT</literal> statement.)
</para>
<para>
@@ -894,7 +899,7 @@
characteristics that you actually wish to change; options which
are omitted retain their existing values. This includes any
default values for <literal>CREATE EVENT</literal> such as
- <literal>ENABLED</literal>.
+ <literal>ENABLE</literal>.
</para>
</section>
@@ -1011,9 +1016,9 @@
</programlisting>
<para>
- Note that the <literal>EVENT</literal> privilege has schema-level
- scope. Therefore, trying to grant it on a single table results in
- an error as shown:
+ The <literal>EVENT</literal> privilege has schema-level scope.
+ Therefore, trying to grant it on a single table results in an
+ error as shown:
</para>
<programlisting>
@@ -1086,7 +1091,7 @@
</para>
<programlisting>
-mysql> <userinput>SELECT * FROM EVENTS</userinput>
+mysql> <userinput>SELECT * FROM INFORMATION_SCHEMA.EVENTS</userinput>
> <userinput>WHERE EVENT_NAME='e_store_ts'</userinput>
> <userinput>AND EVENT_SCHEMA='myschema'\G</userinput>
*************************** 1. row ***************************
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2006-02-16 08:38:47 UTC (rev 1343)
+++ trunk/refman-5.1/information-schema.xml 2006-02-16 10:30:08 UTC (rev 1344)
@@ -3896,7 +3896,7 @@
<listitem>
<para>
<literal>STATUS</literal>: One of the two values
- <literal>ENABLED</literal> or <literal>DISABLE</literal>.
+ <literal>ENABLED</literal> or <literal>DISABLED</literal>.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-02-16 08:38:47 UTC (rev 1343)
+++ trunk/refman-5.1/sql-syntax.xml 2006-02-16 10:30:08 UTC (rev 1344)
@@ -15614,8 +15614,8 @@
<para>
This statement displays the <literal>CREATE TABLE</literal>
statement needed to re-create a given event. For example
- (using the same event <literal>e_daily</literal> defined in
- <xref linkend="show-events"/>):
+ (using the same event <literal>e_daily</literal> defined and
+ then altered in <xref linkend="show-events"/>):
</para>
<programlisting>
@@ -15626,7 +15626,7 @@
Create Event: CREATE EVENT e_daily
ON SCHEDULE EVERY 1 DAY
STARTS CURRENT_TIMESTAMP + INTERVAL 6 HOUR
- ENABLED
+ ENABLE
COMMENT 'Saves total number of sessions and
clears the table once per day.'
DO
@@ -15640,7 +15640,7 @@
<para>
Note that the output reflects the current status of the event
- (<literal>ENABLED</literal>) rather than the status with which
+ (<literal>ENABLE</literal>) rather than the status with which
it was created.
</para>
@@ -16284,7 +16284,7 @@
<listitem>
<para>
<literal>Status</literal>: The event status. One of
- <literal>ENABLED</literal> or <literal>DISABLE</literal>.
+ <literal>ENABLED</literal> or <literal>DISABLED</literal>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1344 - trunk/refman-5.1 | jon | 16 Feb |
