List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 17 2008 10:13pm
Subject:svn commit - mysqldoc@docsrva: r12504 - in trunk: . dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
View as plain text  
Author: paul
Date: 2008-11-17 22:13:50 +0100 (Mon, 17 Nov 2008)
New Revision: 12504

Log:
 r35780@frost:  paul | 2008-11-17 15:13:32 -0500
 Split SHOW FUNCTION|PROCEDURE STATUS into separate sections,
 add auto-link markup


Modified:
   2004-08-03 15:29:37
   2004-08-03 15:29:37
   2004-08-03 15:29:37
   2004-08-03 15:29:37
   trunk/dynamic-docs/changelog/connector-j.xml
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/refman-5.0/sql-syntax-server-administration.xml
   trunk/refman-5.0/stored-routines.xml
   trunk/refman-5.1-maria/sql-syntax-server-administration.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.1/stored-routines.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml
   trunk/refman-6.0/stored-routines.xml

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


Modified: trunk/dynamic-docs/changelog/connector-j.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-j.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/dynamic-docs/changelog/connector-j.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 677 bytes

@@ -2403,8 +2403,8 @@
 
       <para>
         Fixed <literal>DatabaseMetaData.getProcedures()</literal> when
-        run on MySQL-5.0.0 (output of <literal>SHOW PROCEDURE
-        STATUS</literal> changed between 5.0.0 and 5.0.1.
+        run on MySQL-5.0.0 (output of <literal role="stmt">SHOW
+        PROCEDURE STATUS</literal> changed between 5.0.0 and 5.0.1.
       </para>
 
     </message>


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 1353 bytes

@@ -23325,9 +23325,9 @@
       <para>
         Concurrent execution of
         <literal role="stmt" condition="flush">FLUSH TABLES</literal>
-        along with <literal>SHOW FUNCTION STATUS</literal> or
-        <literal>SHOW PROCEDURE STATUS</literal> could cause a server
-        crash.
+        along with <literal role="stmt">SHOW FUNCTION STATUS</literal>
+        or <literal role="stmt">SHOW PROCEDURE STATUS</literal> could
+        cause a server crash.
       </para>
 
     </message>

@@ -30334,10 +30334,10 @@
     <message>
 
       <para>
-        Access checks were skipped for <literal>SHOW PROCEDURE
-        STATUS</literal> and <literal>SHOW FUNCTION STATUS</literal>,
-        which could lead to a server crash or insufficient access checks
-        in subsequent statements.
+        Access checks were skipped for <literal role="stmt">SHOW
+        PROCEDURE STATUS</literal> and <literal role="stmt">SHOW
+        FUNCTION STATUS</literal>, which could lead to a server crash or
+        insufficient access checks in subsequent statements.
       </para>
 
     </message>


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 7; 1820 bytes

@@ -11595,8 +11595,8 @@
         name (<literal>CREATE PROCEDURE
        
<replaceable>db_name</replaceable>.<replaceable>proc_name</replaceable>
         ...</literal>). 2) Create another stored procedure with no
-        database name qualifier. 3) Execute <literal>SHOW PROCEDURE
-        STATUS</literal>.
+        database name qualifier. 3) Execute <literal role="stmt">SHOW
+        PROCEDURE STATUS</literal>.
       </para>
 
     </message>

@@ -82376,8 +82376,8 @@
       <para>
         Created a user function with an empty string (that is,
         <literal>CREATE FUNCTION ''()</literal>), was accepted by the
-        server. Following this, calling <literal>SHOW FUNCTION
-        STATUS</literal> would cause the server to crash.
+        server. Following this, calling <literal role="stmt">SHOW
+        FUNCTION STATUS</literal> would cause the server to crash.
       </para>
 
     </message>

@@ -134947,9 +134947,10 @@
         EVENT</literal>, <literal>SHOW CREATE FUNCTION</literal>,
         <literal>SHOW CREATE PROCEDURE</literal>,
         <literal role="stmt">SHOW CREATE VIEW</literal>,
-        <literal role="stmt">SHOW EVENTS</literal>, <literal>SHOW
-        FUNCTION STATUS</literal>, <literal>SHOW PROCEDURE
-        STATUS</literal>, <literal role="stmt">SHOW TRIGGERS</literal>.
+        <literal role="stmt">SHOW EVENTS</literal>,
+        <literal role="stmt">SHOW FUNCTION STATUS</literal>,
+        <literal role="stmt">SHOW PROCEDURE STATUS</literal>,
+        <literal role="stmt">SHOW TRIGGERS</literal>.
       </para>
 
       <para>


Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml	2008-11-17 21:13:28 UTC (rev
12503)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml	2008-11-17 21:13:50 UTC (rev
12504)
Changed blocks: 4, Lines Added: 49, Lines Deleted: 17; 4080 bytes

@@ -5190,6 +5190,37 @@
 
     </section>
 
+    <section id="show-function-status">
+
+      <title><literal role="stmt">SHOW FUNCTION STATUS</literal>
Syntax</title>
+
+      <indexterm>
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <remark role="help-topic" condition="SHOW FUNCTION STATUS"/>
+
+      <remark role="help-keywords">
+        SHOW FUNCTION STATUS
+      </remark>
+
+      <remark role="help-syntax"/>
+
+<programlisting>
+SHOW FUNCTION STATUS
+    [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
+</programlisting>
+
+      <remark role="help-description-begin"/>
+
+      <para>
+        This statement is similar to <literal role="stmt">SHOW PROCEDURE
+        STATUS</literal> but for stored functions. See
+        <xref linkend="show-procedure-status"/>.
+      </para>
+
+    </section>
+
     <section id="show-grants">
 
       <title><literal role="stmt">SHOW GRANTS</literal>
Syntax</title>

@@ -5992,7 +6023,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        This statement is a MySQL extensions that is available only for
+        This statement is a MySQL extension that is available only for
         servers that have been built with debugging support. It displays
         a representation of the internal implementation of the named
         stored procedure. A similar statement, <literal role="stmt">SHOW

@@ -6068,38 +6099,39 @@
 
     <section id="show-procedure-status">
 
-      <title><literal>SHOW PROCEDURE STATUS</literal> and
<literal>SHOW FUNCTION
-        STATUS</literal> Syntax</title>
+      <title><literal role="stmt">SHOW PROCEDURE STATUS</literal>
Syntax</title>
 
       <indexterm>
         <primary>SHOW PROCEDURE STATUS</primary>
       </indexterm>
 
-      <indexterm>
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
       <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
 
       <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
+        SHOW PROCEDURE STATUS
       </remark>
 
       <remark role="help-syntax"/>
 
 <programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS
+SHOW PROCEDURE STATUS
     [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        These statements are MySQL extensions. They return
-        characteristics of routines, such as the database, name, type,
-        creator, and creation and modification dates. The
-        <literal role="op">LIKE</literal> clause, if present, indicates
-        which procedure or function names to match. The
+        This statement is a MySQL extension. It returns characteristics
+        of a stored procedure, such as the database, name, type,
+        creator, creation and modification dates, and character set
+        information. A similar statement, <literal role="stmt">SHOW
+        FUNCTION STATUS</literal>, displays information about stored
+        functions (see <xref linkend="show-function-status"/>).
+      </para>
+
+      <para>
+        The <literal role="op">LIKE</literal> clause, if present,
+        indicates which procedure or function names to match. The
         <literal>WHERE</literal> clause can be given to select rows
         using more general conditions, as discussed in
         <xref linkend="extended-show"/>.

@@ -6110,11 +6142,11 @@
       <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+mysql&gt; <userinput>SHOW PROCEDURE STATUS LIKE 'sp1'\G</userinput>
 *************************** 1. row ***************************
            Db: test
-         Name: hello
-         Type: FUNCTION
+         Name: sp1
+         Type: PROCEDURE
       Definer: testuser@localhost


Modified: trunk/refman-5.0/stored-routines.xml
===================================================================
--- trunk/refman-5.0/stored-routines.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/refman-5.0/stored-routines.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 766 bytes

@@ -371,9 +371,9 @@
 
       <listitem>
         <para>
-          Use the <literal>SHOW PROCEDURE STATUS</literal> and
-          <literal>SHOW FUNCTION STATUS</literal> statements to see
-          routine characteristics. See
+          Use the <literal role="stmt">SHOW PROCEDURE STATUS</literal>
+          and <literal role="stmt">SHOW FUNCTION STATUS</literal>
+          statements to see routine characteristics. See
           <xref linkend="show-procedure-status"/>.
         </para>
       </listitem>


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-17 21:13:28 UTC (rev
12503)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-17 21:13:50 UTC (rev
12504)
Changed blocks: 4, Lines Added: 49, Lines Deleted: 17; 4163 bytes

@@ -6198,6 +6198,37 @@
 
     </section>
 
+    <section id="show-function-status">
+
+      <title><literal role="stmt">SHOW FUNCTION STATUS</literal>
Syntax</title>
+
+      <indexterm>
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <remark role="help-topic" condition="SHOW FUNCTION STATUS"/>
+
+      <remark role="help-keywords">
+        SHOW FUNCTION STATUS
+      </remark>
+
+      <remark role="help-syntax"/>
+
+<programlisting>
+SHOW FUNCTION STATUS
+    [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
+</programlisting>
+
+      <remark role="help-description-begin"/>
+
+      <para>
+        This statement is similar to <literal role="stmt">SHOW PROCEDURE
+        STATUS</literal> but for stored functions. See
+        <xref linkend="show-procedure-status"/>.
+      </para>
+
+    </section>
+
     <section id="show-grants">
 
       <title><literal role="stmt">SHOW GRANTS</literal>
Syntax</title>

@@ -6848,7 +6879,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        This statement is a MySQL extensions that is available only for
+        This statement is a MySQL extension that is available only for
         servers that have been built with debugging support. It displays
         a representation of the internal implementation of the named
         stored procedure. A similar statement, <literal role="stmt">SHOW

@@ -6923,39 +6954,40 @@
 
     <section id="show-procedure-status">
 
-      <title><literal>SHOW PROCEDURE STATUS</literal> and
<literal>SHOW FUNCTION
-        STATUS</literal> Syntax</title>
+      <title><literal role="stmt">SHOW PROCEDURE STATUS</literal>
Syntax</title>
 
       <indexterm>
         <primary>SHOW PROCEDURE STATUS</primary>
       </indexterm>
 
-      <indexterm>
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
       <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
 
       <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
+        SHOW PROCEDURE STATUS
       </remark>
 
       <remark role="help-syntax"/>
 
 <programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS
+SHOW PROCEDURE STATUS
     [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        These statements are MySQL extensions. They return
-        characteristics of routines, such as the database, name, type,
+        This statement is a MySQL extension. It returns characteristics
+        of a stored procedure, such as the database, name, type,
         creator, creation and modification dates, and character set
-        information. The <literal role="op">LIKE</literal> clause, if
-        present, indicates which procedure or function names to match.
-        The <literal>WHERE</literal> clause can be given to select rows
+        information. A similar statement, <literal role="stmt">SHOW
+        FUNCTION STATUS</literal>, displays information about stored
+        functions (see <xref linkend="show-function-status"/>).
+      </para>
+
+      <para>
+        The <literal role="op">LIKE</literal> clause, if present,
+        indicates which procedure or function names to match. The
+        <literal>WHERE</literal> clause can be given to select rows
         using more general conditions, as discussed in
         <xref linkend="extended-show"/>.
       </para>

@@ -6965,11 +6997,11 @@
       <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+mysql&gt; <userinput>SHOW PROCEDURE STATUS LIKE 'sp1'\G</userinput>
 *************************** 1. row ***************************
                   Db: test
-                Name: hello
-                Type: FUNCTION
+                Name: sp1
+                Type: PROCEDURE
              Definer: testuser@localhost


Modified: trunk/refman-5.1/stored-routines.xml
===================================================================
--- trunk/refman-5.1/stored-routines.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/refman-5.1/stored-routines.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 766 bytes

@@ -362,9 +362,9 @@
 
       <listitem>
         <para>
-          Use the <literal>SHOW PROCEDURE STATUS</literal> and
-          <literal>SHOW FUNCTION STATUS</literal> statements to see
-          routine characteristics. See
+          Use the <literal role="stmt">SHOW PROCEDURE STATUS</literal>
+          and <literal role="stmt">SHOW FUNCTION STATUS</literal>
+          statements to see routine characteristics. See
           <xref linkend="show-procedure-status"/>.
         </para>
       </listitem>


Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-17 21:13:28 UTC
(rev 12503)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-17 21:13:50 UTC
(rev 12504)
Changed blocks: 4, Lines Added: 49, Lines Deleted: 17; 4181 bytes

@@ -6279,6 +6279,37 @@
 
     </section>
 
+    <section id="show-function-status">
+
+      <title><literal role="stmt">SHOW FUNCTION STATUS</literal>
Syntax</title>
+
+      <indexterm>
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <remark role="help-topic" condition="SHOW FUNCTION STATUS"/>
+
+      <remark role="help-keywords">
+        SHOW FUNCTION STATUS
+      </remark>
+
+      <remark role="help-syntax"/>
+
+<programlisting>
+SHOW FUNCTION STATUS
+    [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
+</programlisting>
+
+      <remark role="help-description-begin"/>
+
+      <para>
+        This statement is similar to <literal role="stmt">SHOW PROCEDURE
+        STATUS</literal> but for stored functions. See
+        <xref linkend="show-procedure-status"/>.
+      </para>
+
+    </section>
+
     <section id="show-grants">
 
       <title><literal role="stmt">SHOW GRANTS</literal>
Syntax</title>

@@ -6929,7 +6960,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        This statement is a MySQL extensions that is available only for
+        This statement is a MySQL extension that is available only for
         servers that have been built with debugging support. It displays
         a representation of the internal implementation of the named
         stored procedure. A similar statement, <literal role="stmt">SHOW

@@ -7004,39 +7035,40 @@
 
     <section id="show-procedure-status">
 
-      <title><literal>SHOW PROCEDURE STATUS</literal> and
<literal>SHOW FUNCTION
-        STATUS</literal> Syntax</title>
+      <title><literal role="stmt">SHOW PROCEDURE STATUS</literal>
Syntax</title>
 
       <indexterm>
         <primary>SHOW PROCEDURE STATUS</primary>
       </indexterm>
 
-      <indexterm>
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
       <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
 
       <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
+        SHOW PROCEDURE STATUS
       </remark>
 
       <remark role="help-syntax"/>
 
 <programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS
+SHOW PROCEDURE STATUS
     [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        These statements are MySQL extensions. They return
-        characteristics of routines, such as the database, name, type,
+        This statement is a MySQL extension. It returns characteristics
+        of a stored procedure, such as the database, name, type,
         creator, creation and modification dates, and character set
-        information. The <literal role="op">LIKE</literal> clause, if
-        present, indicates which procedure or function names to match.
-        The <literal>WHERE</literal> clause can be given to select rows
+        information. A similar statement, <literal role="stmt">SHOW
+        FUNCTION STATUS</literal>, displays information about stored
+        functions (see <xref linkend="show-function-status"/>).
+      </para>
+
+      <para>
+        The <literal role="op">LIKE</literal> clause, if present,
+        indicates which procedure or function names to match. The
+        <literal>WHERE</literal> clause can be given to select rows
         using more general conditions, as discussed in
         <xref linkend="extended-show"/>.
       </para>

@@ -7046,11 +7078,11 @@
       <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+mysql&gt; <userinput>SHOW PROCEDURE STATUS LIKE 'sp1'\G</userinput>
 *************************** 1. row ***************************
                   Db: test
-                Name: hello
-                Type: FUNCTION
+                Name: sp1
+                Type: PROCEDURE
              Definer: testuser@localhost


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-17 21:13:28 UTC (rev
12503)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-17 21:13:50 UTC (rev
12504)
Changed blocks: 4, Lines Added: 49, Lines Deleted: 17; 4163 bytes

@@ -6047,6 +6047,37 @@
 
     </section>
 
+    <section id="show-function-status">
+
+      <title><literal role="stmt">SHOW FUNCTION STATUS</literal>
Syntax</title>
+
+      <indexterm>
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <remark role="help-topic" condition="SHOW FUNCTION STATUS"/>
+
+      <remark role="help-keywords">
+        SHOW FUNCTION STATUS
+      </remark>
+
+      <remark role="help-syntax"/>
+
+<programlisting>
+SHOW FUNCTION STATUS
+    [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
+</programlisting>
+
+      <remark role="help-description-begin"/>
+
+      <para>
+        This statement is similar to <literal role="stmt">SHOW PROCEDURE
+        STATUS</literal> but for stored functions. See
+        <xref linkend="show-procedure-status"/>.
+      </para>
+
+    </section>
+
     <section id="show-grants">
 
       <title><literal role="stmt">SHOW GRANTS</literal>
Syntax</title>

@@ -6670,7 +6701,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        This statement is a MySQL extensions that is available only for
+        This statement is a MySQL extension that is available only for
         servers that have been built with debugging support. It displays
         a representation of the internal implementation of the named
         stored procedure. A similar statement, <literal role="stmt">SHOW

@@ -6741,39 +6772,40 @@
 
     <section id="show-procedure-status">
 
-      <title><literal>SHOW PROCEDURE STATUS</literal> and
<literal>SHOW FUNCTION
-        STATUS</literal> Syntax</title>
+      <title><literal role="stmt">SHOW PROCEDURE STATUS</literal>
Syntax</title>
 
       <indexterm>
         <primary>SHOW PROCEDURE STATUS</primary>
       </indexterm>
 
-      <indexterm>
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
       <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
 
       <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
+        SHOW PROCEDURE STATUS
       </remark>
 
       <remark role="help-syntax"/>
 
 <programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS
+SHOW PROCEDURE STATUS
     [LIKE '<replaceable>pattern</replaceable>' | WHERE
<replaceable>expr</replaceable>]
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        These statements are MySQL extensions. They return
-        characteristics of routines, such as the database, name, type,
+        This statement is a MySQL extension. It returns characteristics
+        of a stored procedure, such as the database, name, type,
         creator, creation and modification dates, and character set
-        information. The <literal role="op">LIKE</literal> clause, if
-        present, indicates which procedure or function names to match.
-        The <literal>WHERE</literal> clause can be given to select rows
+        information. A similar statement, <literal role="stmt">SHOW
+        FUNCTION STATUS</literal>, displays information about stored
+        functions (see <xref linkend="show-function-status"/>).
+      </para>
+
+      <para>
+        The <literal role="op">LIKE</literal> clause, if present,
+        indicates which procedure or function names to match. The
+        <literal>WHERE</literal> clause can be given to select rows
         using more general conditions, as discussed in
         <xref linkend="extended-show"/>.
       </para>

@@ -6783,11 +6815,11 @@
       <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+mysql&gt; <userinput>SHOW PROCEDURE STATUS LIKE 'sp1'\G</userinput>
 *************************** 1. row ***************************
                   Db: test
-                Name: hello
-                Type: FUNCTION
+                Name: sp1
+                Type: PROCEDURE
              Definer: testuser@localhost


Modified: 2004-08-03 15:29:37
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 84 bytes


Modified: trunk/refman-6.0/stored-routines.xml
===================================================================
--- trunk/refman-6.0/stored-routines.xml	2008-11-17 21:13:28 UTC (rev 12503)
+++ trunk/refman-6.0/stored-routines.xml	2008-11-17 21:13:50 UTC (rev 12504)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 766 bytes

@@ -364,9 +364,9 @@
 
       <listitem>
         <para>
-          Use the <literal>SHOW PROCEDURE STATUS</literal> and
-          <literal>SHOW FUNCTION STATUS</literal> statements to see
-          routine characteristics. See
+          Use the <literal role="stmt">SHOW PROCEDURE STATUS</literal>
+          and <literal role="stmt">SHOW FUNCTION STATUS</literal>
+          statements to see routine characteristics. See
           <xref linkend="show-procedure-status"/>.
         </para>
       </listitem>


Thread
svn commit - mysqldoc@docsrva: r12504 - in trunk: . dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.1-maria refman-6.0paul.dubois17 Nov