Author: paul
Date: 2008-09-12 18:13:19 +0200 (Fri, 12 Sep 2008)
New Revision: 11799
Log:
r33958@frost: paul | 2008-09-12 11:14:18 -0500
General revisions/cleanup
Modified:
trunk/refman-5.0/sql-syntax-data-definition.xml
trunk/refman-5.0/stored-routines.xml
trunk/refman-5.1/events.xml
trunk/refman-5.1/sql-syntax-data-definition.xml
trunk/refman-5.1/stored-routines.xml
trunk/refman-6.0/events.xml
trunk/refman-6.0/sql-syntax-data-definition.xml
trunk/refman-6.0/stored-routines.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:33956
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33057
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33958
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33057
Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1003 bytes
@@ -2014,11 +2014,11 @@
</para>
<para>
- In versions prior to 5.0.44-sp1, the
- <literal>DETERMINISTIC</literal> characteristic is accepted, but
- not used by the optimizer. However, if binary logging is enabled,
- this characteristic always affects which routine definitions MySQL
- accepts. See <xref linkend="stored-procedure-logging"/>.
+ Prior to MySQL 5.0.44, the <literal>DETERMINISTIC</literal>
+ characteristic is accepted, but not used by the optimizer.
+ However, if binary logging is enabled, this characteristic always
+ affects which routine definitions MySQL accepts. See
+ <xref linkend="stored-procedure-logging"/>.
</para>
<para>
Modified: trunk/refman-5.0/stored-routines.xml
===================================================================
--- trunk/refman-5.0/stored-routines.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-5.0/stored-routines.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 9; 2211 bytes
@@ -5,7 +5,7 @@
]>
<section id="stored-routines">
- <title>Stored Procedures and Functions</title>
+ <title>Using Stored Routines (Procedures and Functions)</title>
<indexterm>
<primary>stored procedures</primary>
@@ -16,6 +16,15 @@
<secondary>stored</secondary>
</indexterm>
+ <indexterm>
+ <primary>stored functions</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>functions</primary>
+ <secondary>stored</secondary>
+ </indexterm>
+
<para>
Stored routines (procedures and functions) are supported in MySQL
¤t-series;. A stored procedure is a set of SQL statements that
@@ -37,7 +46,7 @@
</formalpara>
<para>
- Some situations where stored routines can be particularly useful:
+ Stored routines can be particularly useful in certain situations:
</para>
<itemizedlist>
@@ -215,13 +224,14 @@
<para>
A stored routine is either a procedure or a function. Stored
- routines are created with <literal>CREATE PROCEDURE</literal> and
- <literal>CREATE FUNCTION</literal> statements. A procedure is
- invoked using a <literal>CALL</literal> statement, and can only
- pass back values using output variables. A function can be called
- from inside a statement just like any other function (that is, by
- invoking the function's name), and can return a scalar value.
- Stored routines may call other stored routines.
+ routines are created with the <literal>CREATE PROCEDURE</literal>
+ and <literal>CREATE FUNCTION</literal> statements (see
+ <xref linkend="create-procedure"/>). A procedure is invoked using
+ a <literal>CALL</literal> statement, and can only pass back values
+ using output variables. A function can be called from inside a
+ statement just like any other function (that is, by invoking the
+ function's name), and can return a scalar value. Stored routines
+ may call other stored routines.
</para>
<para>
Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-5.1/events.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 409 bytes
@@ -5,7 +5,7 @@
]>
<section id="events">
- <title>Event Scheduler</title>
+ <title>Using the Event Scheduler</title>
<indexterm>
<primary>Event Scheduler</primary>
Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1004 bytes
@@ -3983,11 +3983,11 @@
</para>
<para>
- In versions prior to 5.1.21-beta, the
- <literal>DETERMINISTIC</literal> characteristic is accepted, but
- not used by the optimizer. However, if binary logging is enabled,
- this characteristic always affects which routine definitions MySQL
- accepts. See <xref linkend="stored-procedure-logging"/>.
+ Prior to MySQL 5.1.21, the <literal>DETERMINISTIC</literal>
+ characteristic is accepted, but not used by the optimizer.
+ However, if binary logging is enabled, this characteristic always
+ affects which routine definitions MySQL accepts. See
+ <xref linkend="stored-procedure-logging"/>.
</para>
<para>
Modified: trunk/refman-5.1/stored-routines.xml
===================================================================
--- trunk/refman-5.1/stored-routines.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-5.1/stored-routines.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 9; 2211 bytes
@@ -5,7 +5,7 @@
]>
<section id="stored-routines">
- <title>Stored Procedures and Functions</title>
+ <title>Using Stored Routines (Procedures and Functions)</title>
<indexterm>
<primary>stored procedures</primary>
@@ -16,6 +16,15 @@
<secondary>stored</secondary>
</indexterm>
+ <indexterm>
+ <primary>stored functions</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>functions</primary>
+ <secondary>stored</secondary>
+ </indexterm>
+
<para>
Stored routines (procedures and functions) are supported in MySQL
¤t-series;. A stored procedure is a set of SQL statements that
@@ -37,7 +46,7 @@
</formalpara>
<para>
- Some situations where stored routines can be particularly useful:
+ Stored routines can be particularly useful in certain situations:
</para>
<itemizedlist>
@@ -215,13 +224,14 @@
<para>
A stored routine is either a procedure or a function. Stored
- routines are created with <literal>CREATE PROCEDURE</literal> and
- <literal>CREATE FUNCTION</literal> statements. A procedure is
- invoked using a <literal>CALL</literal> statement, and can only
- pass back values using output variables. A function can be called
- from inside a statement just like any other function (that is, by
- invoking the function's name), and can return a scalar value.
- Stored routines may call other stored routines.
+ routines are created with the <literal>CREATE PROCEDURE</literal>
+ and <literal>CREATE FUNCTION</literal> statements (see
+ <xref linkend="create-procedure"/>). A procedure is invoked using
+ a <literal>CALL</literal> statement, and can only pass back values
+ using output variables. A function can be called from inside a
+ statement just like any other function (that is, by invoking the
+ function's name), and can return a scalar value. Stored routines
+ may call other stored routines.
</para>
<para>
Modified: trunk/refman-6.0/events.xml
===================================================================
--- trunk/refman-6.0/events.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-6.0/events.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 409 bytes
@@ -5,7 +5,7 @@
]>
<section id="events">
- <title>Event Scheduler</title>
+ <title>Using the Event Scheduler</title>
<indexterm>
<primary>Event Scheduler</primary>
Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 675 bytes
@@ -3345,7 +3345,7 @@
</para>
<para>
- In versions prior to 6.0.3, the <literal>DETERMINISTIC</literal>
+ Prior to MySQL 6.0.3, the <literal>DETERMINISTIC</literal>
characteristic is accepted, but not used by the optimizer.
However, if binary logging is enabled, this characteristic always
affects which routine definitions MySQL accepts. See
Modified: trunk/refman-6.0/stored-routines.xml
===================================================================
--- trunk/refman-6.0/stored-routines.xml 2008-09-12 16:03:45 UTC (rev 11798)
+++ trunk/refman-6.0/stored-routines.xml 2008-09-12 16:13:19 UTC (rev 11799)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 9; 2211 bytes
@@ -5,7 +5,7 @@
]>
<section id="stored-routines">
- <title>Stored Procedures and Functions</title>
+ <title>Using Stored Routines (Procedures and Functions)</title>
<indexterm>
<primary>stored procedures</primary>
@@ -16,6 +16,15 @@
<secondary>stored</secondary>
</indexterm>
+ <indexterm>
+ <primary>stored functions</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>functions</primary>
+ <secondary>stored</secondary>
+ </indexterm>
+
<para>
Stored routines (procedures and functions) are supported in MySQL
¤t-series;. A stored procedure is a set of SQL statements that
@@ -37,7 +46,7 @@
</formalpara>
<para>
- Some situations where stored routines can be particularly useful:
+ Stored routines can be particularly useful in certain situations:
</para>
<itemizedlist>
@@ -215,13 +224,14 @@
<para>
A stored routine is either a procedure or a function. Stored
- routines are created with <literal>CREATE PROCEDURE</literal> and
- <literal>CREATE FUNCTION</literal> statements. A procedure is
- invoked using a <literal>CALL</literal> statement, and can only
- pass back values using output variables. A function can be called
- from inside a statement just like any other function (that is, by
- invoking the function's name), and can return a scalar value.
- Stored routines may call other stored routines.
+ routines are created with the <literal>CREATE PROCEDURE</literal>
+ and <literal>CREATE FUNCTION</literal> statements (see
+ <xref linkend="create-procedure"/>). A procedure is invoked using
+ a <literal>CALL</literal> statement, and can only pass back values
+ using output variables. A function can be called from inside a
+ statement just like any other function (that is, by invoking the
+ function's name), and can return a scalar value. Stored routines
+ may call other stored routines.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11799 - in trunk: . refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 12 Sep |
