List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 11:48pm
Subject:svn commit - mysqldoc@docsrva: r1052 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-27 00:47:55 +0100 (Fri, 27 Jan 2006)
New Revision: 1052

Log:
 r6722@frost:  paul | 2006-01-26 17:44:12 -0600
 Rework SQLPS section so that we can add help-table markup.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6690
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2564
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6722
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2564

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-26 21:43:21 UTC (rev 1051)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-26 23:47:55 UTC (rev 1052)
@@ -18197,8 +18197,8 @@
       Other language interfaces can provide support for prepared
       statements that use the binary protocol by linking in the C client
       library, one example being the
-      <ulink url="http://php.net/mysqli">mysqli extension in PHP
-      5.0</ulink>.
+      <ulink url="http://php.net/mysqli"><literal>mysqli</literal>
+      extension in PHP 5.0</ulink>.
     </para>
 
     <remark role="todo">
@@ -18253,15 +18253,20 @@
 
       <listitem>
         <para>
-          You may want to test how prepared statements work in your
-          application before coding it, or perhaps an application has
-          problems executing prepared statements and you want to
-          determine interactively what the problem is.
+          You want to test how prepared statements work in your
+          application before coding it.
         </para>
       </listitem>
 
       <listitem>
         <para>
+          An application has problems executing prepared statements and
+          you want to determine interactively what the problem is.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           You want to create a test case that describes a problem you
           are having with prepared statements, so that you can file a
           bug report.
@@ -18282,74 +18287,152 @@
       statements:
     </para>
 
-<programlisting>
-PREPARE <replaceable>stmt_name</replaceable> FROM <replaceable>preparable_stmt</replaceable>;
+    <itemizedlist>
 
-EXECUTE <replaceable>stmt_name</replaceable> [USING @<replaceable>var_name</replaceable> [, @<replaceable>var_name</replaceable>] ...];
+      <listitem>
+        <remark role="help-topic" condition="PREPARE"/>
 
-{DEALLOCATE | DROP} PREPARE <replaceable>stmt_name</replaceable>;
-</programlisting>
+        <remark role="help-keywords">
+          PREPARE
+        </remark>
 
-    <para>
-      The <literal>PREPARE</literal> statement prepares a statement and
-      assigns it a name, <replaceable>stmt_name</replaceable>, by which
-      to refer to the statement later. Statement names are not case
-      sensitive. <replaceable>preparable_stmt</replaceable> is either a
-      string literal or a user variable that contains the text of the
-      statement. The text must represent a single SQL statement, not
-      multiple statements. Within the statement,
-      &lsquo;<literal>?</literal>&rsquo; characters can be used as
-      parameter markers to indicate where data values are to be bound to
-      the query later when you execute it. The
-      &lsquo;<literal>?</literal>&rsquo; characters should not be
-      enclosed within quotes, even if you intend to bind them to string
-      values. Parameter markers can be used only where data values
-      should appear, not for SQL keywords, identifiers, and so forth.
-    </para>
+        <remark role="help-syntax-begin"/>
 
-    <para>
-      If a prepared statement with that name already exists, it is
-      deallocated implicitly before the new statement is prepared. This
-      means that if the new statement contains an error and cannot be
-      prepared, an error is returned and no statement with the given
-      name exists.
-    </para>
+        <para>
+          <indexterm>
+            <primary><literal>PREPARE</literal></primary>
+          </indexterm>
 
-    <para>
-      The scope of a prepared statement is the client session within
-      which it is created. Other clients cannot see it.
-    </para>
+          <literal>PREPARE <replaceable>stmt_name</replaceable> FROM
+          <replaceable>preparable_stmt</replaceable></literal>
+        </para>
 
-    <para>
-      After preparing a statement, you execute it with an
-      <literal>EXECUTE</literal> statement that refers to the prepared
-      statement name. If the prepared statement contains any parameter
-      markers, you must supply a <literal>USING</literal> clause that
-      lists user variables containing the values to be bound to the
-      parameters. Parameter values can be supplied only by user
-      variables, and the <literal>USING</literal> clause must name
-      exactly as many variables as the number of parameter markers in
-      the statement.
-    </para>
+        <remark role="help-syntax-end"/>
 
-    <para>
-      You can execute a given prepared statement multiple times, passing
-      different variables to it or setting the variables to different
-      values before each execution.
-    </para>
+        <remark role="help-description-begin"/>
 
-    <para>
-      To deallocate a prepared statement, use the <literal>DEALLOCATE
-      PREPARE</literal> statement. Attempting to execute a prepared
-      statement after deallocating it results in an error.
-    </para>
+        <para>
+          The <literal>PREPARE</literal> statement prepares a statement
+          and assigns it a name, <replaceable>stmt_name</replaceable>,
+          by which to refer to the statement later. Statement names are
+          not case sensitive. <replaceable>preparable_stmt</replaceable>
+          is either a string literal or a user variable that contains
+          the text of the statement. The text must represent a single
+          SQL statement, not multiple statements. Within the statement,
+          &lsquo;<literal>?</literal>&rsquo; characters can be used as
+          parameter markers to indicate where data values are to be
+          bound to the query later when you execute it. The
+          &lsquo;<literal>?</literal>&rsquo; characters should not be
+          enclosed within quotes, even if you intend to bind them to
+          string values. Parameter markers can be used only where data
+          values should appear, not for SQL keywords, identifiers, and
+          so forth.
+        </para>
 
-    <para>
-      If you terminate a client session without deallocating a
-      previously prepared statement, the server deallocates it
-      automatically.
-    </para>
+        <para>
+          If a prepared statement with the given name already exists, it
+          is deallocated implicitly before the new statement is
+          prepared. This means that if the new statement contains an
+          error and cannot be prepared, an error is returned and no
+          statement with the given name exists.
+        </para>
 
+        <para>
+          The scope of a prepared statement is the client session within
+          which it is created. Other clients cannot see it.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="EXECUTE statement"/>
+
+        <remark role="help-keywords">
+          EXECUTE USING
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>EXECUTE</literal> statement</primary>
+          </indexterm>
+
+          <literal>EXECUTE <replaceable>stmt_name</replaceable> [USING
+          @<replaceable>var_name</replaceable> [,
+          @<replaceable>var_name</replaceable>] ...]</literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          After preparing a statement, you execute it with an
+          <literal>EXECUTE</literal> statement that refers to the
+          prepared statement name. If the prepared statement contains
+          any parameter markers, you must supply a
+          <literal>USING</literal> clause that lists user variables
+          containing the values to be bound to the parameters. Parameter
+          values can be supplied only by user variables, and the
+          <literal>USING</literal> clause must name exactly as many
+          variables as the number of parameter markers in the statement.
+        </para>
+
+        <para>
+          You can execute a given prepared statement multiple times,
+          passing different variables to it or setting the variables to
+          different values before each execution.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="DEALLOCATE PREPARE"/>
+
+        <remark role="help-keywords">
+          DEALLOCATE PREPARE DROP
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>DEALLOCATE PREPARE</literal></primary>
+          </indexterm>
+
+          <indexterm>
+            <primary><literal>DROP PREPARE</literal></primary>
+          </indexterm>
+
+          <literal>{DEALLOCATE | DROP} PREPARE
+          <replaceable>stmt_name</replaceable></literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          To deallocate a prepared statement, use the
+          <literal>DEALLOCATE PREPARE</literal> statement. Attempting to
+          execute a prepared statement after deallocating it results in
+          an error.
+        </para>
+
+        <para>
+          If you terminate a client session without deallocating a
+          previously prepared statement, the server deallocates it
+          automatically.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+    </itemizedlist>
+
     <para>
       The following SQL statements can be used in prepared statements:
       <literal>CREATE TABLE</literal>, <literal>DELETE</literal>,

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-26 21:43:21 UTC (rev 1051)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-26 23:47:55 UTC (rev 1052)
@@ -19606,7 +19606,8 @@
       <xref linkend="c-api-prepared-statements"/>. Other language
       interfaces can provide support for prepared statements that use
       the binary protocol by linking in the C client library, one
-      example being the <ulink url="http://php.net/mysqli">mysqli
+      example being the
+      <ulink url="http://php.net/mysqli"><literal>mysqli</literal>
       extension in PHP 5.0</ulink>.
     </para>
 
@@ -19661,15 +19662,20 @@
 
       <listitem>
         <para>
-          You may want to test how prepared statements work in your
-          application before coding it, or perhaps an application has
-          problems executing prepared statements and you want to
-          determine interactively what the problem is.
+          You want to test how prepared statements work in your
+          application before coding it.
         </para>
       </listitem>
 
       <listitem>
         <para>
+          An application has problems executing prepared statements and
+          you want to determine interactively what the problem is.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           You want to create a test case that describes a problem you
           are having with prepared statements, so that you can file a
           bug report.
@@ -19690,74 +19696,152 @@
       statements:
     </para>
 
-<programlisting>
-PREPARE <replaceable>stmt_name</replaceable> FROM <replaceable>preparable_stmt</replaceable>;
+    <itemizedlist>
 
-EXECUTE <replaceable>stmt_name</replaceable> [USING @<replaceable>var_name</replaceable> [, @<replaceable>var_name</replaceable>] ...];
+      <listitem>
+        <remark role="help-topic" condition="PREPARE"/>
 
-{DEALLOCATE | DROP} PREPARE <replaceable>stmt_name</replaceable>;
-</programlisting>
+        <remark role="help-keywords">
+          PREPARE
+        </remark>
 
-    <para>
-      The <literal>PREPARE</literal> statement prepares a statement and
-      assigns it a name, <replaceable>stmt_name</replaceable>, by which
-      to refer to the statement later. Statement names are not case
-      sensitive. <replaceable>preparable_stmt</replaceable> is either a
-      string literal or a user variable that contains the text of the
-      statement. The text must represent a single SQL statement, not
-      multiple statements. Within the statement,
-      &lsquo;<literal>?</literal>&rsquo; characters can be used as
-      parameter markers to indicate where data values are to be bound to
-      the query later when you execute it. The
-      &lsquo;<literal>?</literal>&rsquo; characters should not be
-      enclosed within quotes, even if you intend to bind them to string
-      values. Parameter markers can be used only where data values
-      should appear, not for SQL keywords, identifiers, and so forth.
-    </para>
+        <remark role="help-syntax-begin"/>
 
-    <para>
-      If a prepared statement with that name already exists, it is
-      deallocated implicitly before the new statement is prepared. This
-      means that if the new statement contains an error and cannot be
-      prepared, an error is returned and no statement with the given
-      name exists.
-    </para>
+        <para>
+          <indexterm>
+            <primary><literal>PREPARE</literal></primary>
+          </indexterm>
 
-    <para>
-      The scope of a prepared statement is the client session within
-      which it is created. Other clients cannot see it.
-    </para>
+          <literal>PREPARE <replaceable>stmt_name</replaceable> FROM
+          <replaceable>preparable_stmt</replaceable></literal>
+        </para>
 
-    <para>
-      After preparing a statement, you execute it with an
-      <literal>EXECUTE</literal> statement that refers to the prepared
-      statement name. If the prepared statement contains any parameter
-      markers, you must supply a <literal>USING</literal> clause that
-      lists user variables containing the values to be bound to the
-      parameters. Parameter values can be supplied only by user
-      variables, and the <literal>USING</literal> clause must name
-      exactly as many variables as the number of parameter markers in
-      the statement.
-    </para>
+        <remark role="help-syntax-end"/>
 
-    <para>
-      You can execute a given prepared statement multiple times, passing
-      different variables to it or setting the variables to different
-      values before each execution.
-    </para>
+        <remark role="help-description-begin"/>
 
-    <para>
-      To deallocate a prepared statement, use the <literal>DEALLOCATE
-      PREPARE</literal> statement. Attempting to execute a prepared
-      statement after deallocating it results in an error.
-    </para>
+        <para>
+          The <literal>PREPARE</literal> statement prepares a statement
+          and assigns it a name, <replaceable>stmt_name</replaceable>,
+          by which to refer to the statement later. Statement names are
+          not case sensitive. <replaceable>preparable_stmt</replaceable>
+          is either a string literal or a user variable that contains
+          the text of the statement. The text must represent a single
+          SQL statement, not multiple statements. Within the statement,
+          &lsquo;<literal>?</literal>&rsquo; characters can be used as
+          parameter markers to indicate where data values are to be
+          bound to the query later when you execute it. The
+          &lsquo;<literal>?</literal>&rsquo; characters should not be
+          enclosed within quotes, even if you intend to bind them to
+          string values. Parameter markers can be used only where data
+          values should appear, not for SQL keywords, identifiers, and
+          so forth.
+        </para>
 
-    <para>
-      If you terminate a client session without deallocating a
-      previously prepared statement, the server deallocates it
-      automatically.
-    </para>
+        <para>
+          If a prepared statement with the given name already exists, it
+          is deallocated implicitly before the new statement is
+          prepared. This means that if the new statement contains an
+          error and cannot be prepared, an error is returned and no
+          statement with the given name exists.
+        </para>
 
+        <para>
+          The scope of a prepared statement is the client session within
+          which it is created. Other clients cannot see it.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="EXECUTE statement"/>
+
+        <remark role="help-keywords">
+          EXECUTE USING
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>EXECUTE</literal> statement</primary>
+          </indexterm>
+
+          <literal>EXECUTE <replaceable>stmt_name</replaceable> [USING
+          @<replaceable>var_name</replaceable> [,
+          @<replaceable>var_name</replaceable>] ...]</literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          After preparing a statement, you execute it with an
+          <literal>EXECUTE</literal> statement that refers to the
+          prepared statement name. If the prepared statement contains
+          any parameter markers, you must supply a
+          <literal>USING</literal> clause that lists user variables
+          containing the values to be bound to the parameters. Parameter
+          values can be supplied only by user variables, and the
+          <literal>USING</literal> clause must name exactly as many
+          variables as the number of parameter markers in the statement.
+        </para>
+
+        <para>
+          You can execute a given prepared statement multiple times,
+          passing different variables to it or setting the variables to
+          different values before each execution.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="DEALLOCATE PREPARE"/>
+
+        <remark role="help-keywords">
+          DEALLOCATE PREPARE DROP
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>DEALLOCATE PREPARE</literal></primary>
+          </indexterm>
+
+          <indexterm>
+            <primary><literal>DROP PREPARE</literal></primary>
+          </indexterm>
+
+          <literal>{DEALLOCATE | DROP} PREPARE
+          <replaceable>stmt_name</replaceable></literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          To deallocate a prepared statement, use the
+          <literal>DEALLOCATE PREPARE</literal> statement. Attempting to
+          execute a prepared statement after deallocating it results in
+          an error.
+        </para>
+
+        <para>
+          If you terminate a client session without deallocating a
+          previously prepared statement, the server deallocates it
+          automatically.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+    </itemizedlist>
+
     <para>
       The following SQL statements can be used in prepared statements:
       <literal>CREATE TABLE</literal>, <literal>DELETE</literal>,
@@ -19839,9 +19923,9 @@
     </para>
 
     <para>
-      As of MySQL 5.0.7, placeholders can be used in the
-      <literal>LIMIT</literal> clause when using prepared statements.
-      See <xref linkend="select"/>.
+      As of MySQL 5.0.7, placeholders can be used for the arguments of
+      the <literal>LIMIT</literal> clause when using prepared
+      statements. See <xref linkend="select"/>.
     </para>
 
   </section>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-26 21:43:21 UTC (rev 1051)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-26 23:47:55 UTC (rev 1052)
@@ -20130,7 +20130,8 @@
       <xref linkend="c-api-prepared-statements"/>. Other language
       interfaces can provide support for prepared statements that use
       the binary protocol by linking in the C client library, one
-      example being the <ulink url="http://php.net/mysqli">mysqli
+      example being the
+      <ulink url="http://php.net/mysqli"><literal>mysqli</literal>
       extension in PHP 5.0</ulink>.
     </para>
 
@@ -20185,15 +20186,20 @@
 
       <listitem>
         <para>
-          You may want to test how prepared statements work in your
-          application before coding it, or perhaps an application has
-          problems executing prepared statements and you want to
-          determine interactively what the problem is.
+          You want to test how prepared statements work in your
+          application before coding it.
         </para>
       </listitem>
 
       <listitem>
         <para>
+          An application has problems executing prepared statements and
+          you want to determine interactively what the problem is.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           You want to create a test case that describes a problem you
           are having with prepared statements, so that you can file a
           bug report.
@@ -20214,74 +20220,152 @@
       statements:
     </para>
 
-<programlisting>
-PREPARE <replaceable>stmt_name</replaceable> FROM <replaceable>preparable_stmt</replaceable>;
+    <itemizedlist>
 
-EXECUTE <replaceable>stmt_name</replaceable> [USING @<replaceable>var_name</replaceable> [, @<replaceable>var_name</replaceable>] ...];
+      <listitem>
+        <remark role="help-topic" condition="PREPARE"/>
 
-{DEALLOCATE | DROP} PREPARE <replaceable>stmt_name</replaceable>;
-</programlisting>
+        <remark role="help-keywords">
+          PREPARE
+        </remark>
 
-    <para>
-      The <literal>PREPARE</literal> statement prepares a statement and
-      assigns it a name, <replaceable>stmt_name</replaceable>, by which
-      to refer to the statement later. Statement names are not case
-      sensitive. <replaceable>preparable_stmt</replaceable> is either a
-      string literal or a user variable that contains the text of the
-      statement. The text must represent a single SQL statement, not
-      multiple statements. Within the statement,
-      &lsquo;<literal>?</literal>&rsquo; characters can be used as
-      parameter markers to indicate where data values are to be bound to
-      the query later when you execute it. The
-      &lsquo;<literal>?</literal>&rsquo; characters should not be
-      enclosed within quotes, even if you intend to bind them to string
-      values. Parameter markers can be used only where data values
-      should appear, not for SQL keywords, identifiers, and so forth.
-    </para>
+        <remark role="help-syntax-begin"/>
 
-    <para>
-      If a prepared statement with that name already exists, it is
-      deallocated implicitly before the new statement is prepared. This
-      means that if the new statement contains an error and cannot be
-      prepared, an error is returned and no statement with the given
-      name exists.
-    </para>
+        <para>
+          <indexterm>
+            <primary><literal>PREPARE</literal></primary>
+          </indexterm>
 
-    <para>
-      The scope of a prepared statement is the client session within
-      which it is created. Other clients cannot see it.
-    </para>
+          <literal>PREPARE <replaceable>stmt_name</replaceable> FROM
+          <replaceable>preparable_stmt</replaceable></literal>
+        </para>
 
-    <para>
-      After preparing a statement, you execute it with an
-      <literal>EXECUTE</literal> statement that refers to the prepared
-      statement name. If the prepared statement contains any parameter
-      markers, you must supply a <literal>USING</literal> clause that
-      lists user variables containing the values to be bound to the
-      parameters. Parameter values can be supplied only by user
-      variables, and the <literal>USING</literal> clause must name
-      exactly as many variables as the number of parameter markers in
-      the statement.
-    </para>
+        <remark role="help-syntax-end"/>
 
-    <para>
-      You can execute a given prepared statement multiple times, passing
-      different variables to it or setting the variables to different
-      values before each execution.
-    </para>
+        <remark role="help-description-begin"/>
 
-    <para>
-      To deallocate a prepared statement, use the <literal>DEALLOCATE
-      PREPARE</literal> statement. Attempting to execute a prepared
-      statement after deallocating it results in an error.
-    </para>
+        <para>
+          The <literal>PREPARE</literal> statement prepares a statement
+          and assigns it a name, <replaceable>stmt_name</replaceable>,
+          by which to refer to the statement later. Statement names are
+          not case sensitive. <replaceable>preparable_stmt</replaceable>
+          is either a string literal or a user variable that contains
+          the text of the statement. The text must represent a single
+          SQL statement, not multiple statements. Within the statement,
+          &lsquo;<literal>?</literal>&rsquo; characters can be used as
+          parameter markers to indicate where data values are to be
+          bound to the query later when you execute it. The
+          &lsquo;<literal>?</literal>&rsquo; characters should not be
+          enclosed within quotes, even if you intend to bind them to
+          string values. Parameter markers can be used only where data
+          values should appear, not for SQL keywords, identifiers, and
+          so forth.
+        </para>
 
-    <para>
-      If you terminate a client session without deallocating a
-      previously prepared statement, the server deallocates it
-      automatically.
-    </para>
+        <para>
+          If a prepared statement with the given name already exists, it
+          is deallocated implicitly before the new statement is
+          prepared. This means that if the new statement contains an
+          error and cannot be prepared, an error is returned and no
+          statement with the given name exists.
+        </para>
 
+        <para>
+          The scope of a prepared statement is the client session within
+          which it is created. Other clients cannot see it.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="EXECUTE statement"/>
+
+        <remark role="help-keywords">
+          EXECUTE USING
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>EXECUTE</literal> statement</primary>
+          </indexterm>
+
+          <literal>EXECUTE <replaceable>stmt_name</replaceable> [USING
+          @<replaceable>var_name</replaceable> [,
+          @<replaceable>var_name</replaceable>] ...]</literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          After preparing a statement, you execute it with an
+          <literal>EXECUTE</literal> statement that refers to the
+          prepared statement name. If the prepared statement contains
+          any parameter markers, you must supply a
+          <literal>USING</literal> clause that lists user variables
+          containing the values to be bound to the parameters. Parameter
+          values can be supplied only by user variables, and the
+          <literal>USING</literal> clause must name exactly as many
+          variables as the number of parameter markers in the statement.
+        </para>
+
+        <para>
+          You can execute a given prepared statement multiple times,
+          passing different variables to it or setting the variables to
+          different values before each execution.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+      <listitem>
+        <remark role="help-topic" condition="DEALLOCATE PREPARE"/>
+
+        <remark role="help-keywords">
+          DEALLOCATE PREPARE DROP
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+        <para>
+          <indexterm>
+            <primary><literal>DEALLOCATE PREPARE</literal></primary>
+          </indexterm>
+
+          <indexterm>
+            <primary><literal>DROP PREPARE</literal></primary>
+          </indexterm>
+
+          <literal>{DEALLOCATE | DROP} PREPARE
+          <replaceable>stmt_name</replaceable></literal>
+        </para>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          To deallocate a prepared statement, use the
+          <literal>DEALLOCATE PREPARE</literal> statement. Attempting to
+          execute a prepared statement after deallocating it results in
+          an error.
+        </para>
+
+        <para>
+          If you terminate a client session without deallocating a
+          previously prepared statement, the server deallocates it
+          automatically.
+        </para>
+
+        <remark role="help-description-end"/>
+      </listitem>
+
+    </itemizedlist>
+
     <para>
       The following SQL statements can be used in prepared statements:
       <literal>CREATE TABLE</literal>, <literal>DELETE</literal>,
@@ -20361,8 +20445,9 @@
     </para>
 
     <para>
-      Placeholders can be used in the <literal>LIMIT</literal> clause
-      when using prepared statements. See <xref linkend="select"/>.
+      Placeholders can be used for the arguments of the
+      <literal>LIMIT</literal> clause when using prepared statements.
+      See <xref linkend="select"/>.
     </para>
 
   </section>

Thread
svn commit - mysqldoc@docsrva: r1052 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul27 Jan