List:Commits« Previous MessageNext Message »
From:paul Date:January 28 2006 7:13pm
Subject:svn commit - mysqldoc@docsrva: r1080 - in trunk: . refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-28 20:13:23 +0100 (Sat, 28 Jan 2006)
New Revision: 1080

Log:
 r6808@frost:  paul | 2006-01-28 12:24:37 -0600
 Shift some sections.


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


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

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-28 19:13:01 UTC (rev 1079)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-28 19:13:23 UTC (rev 1080)
@@ -14396,6 +14396,14 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW CREATE FUNCTION</primary>
+      </indexterm>
+
+      <indexterm type="function">
+        <primary>SHOW CREATE PROCEDURE</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW CREATE SCHEMA</primary>
       </indexterm>
 
@@ -14428,6 +14436,10 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW GRANTS</primary>
       </indexterm>
 
@@ -14452,6 +14464,10 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW PROCEDURE STATUS</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW PROCESSLIST</primary>
       </indexterm>
 
@@ -14493,7 +14509,7 @@
         COLUMNS LIKE TABLES OPEN FROM INDEX INDEXES STATUS VARIABLES
         DATABASE SCHEMA DATABASES SCHEMAS LOGS FULL PROCESSLIST FOR
         GRANTS TABLE CREATE WARNINGS ERRORS TYPES FIELDS HOSTS KEYS
-        ENGINE ENGINES INNODB
+        ENGINE ENGINES INNODB FUNCTION PROCEDURE
       </remark>
 
       <remark role="help-description-begin"/>
@@ -14507,14 +14523,18 @@
 <programlisting>
 SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 SHOW CREATE DATABASE <replaceable>db_name</replaceable>
+SHOW CREATE FUNCTION <replaceable>funcname</replaceable>
+SHOW CREATE PROCEDURE <replaceable>procname</replaceable>
 SHOW CREATE TABLE <replaceable>tbl_name</replaceable>
 SHOW DATABASES [LIKE '<replaceable>pattern</replaceable>']
 SHOW ENGINE <replaceable>engine_name</replaceable> {LOGS | STATUS }
 SHOW [STORAGE] ENGINES
 SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
+SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
 SHOW GRANTS FOR <replaceable>user</replaceable>
 SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
 SHOW INNODB STATUS
+SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
 SHOW [BDB] LOGS
 SHOW PRIVILEGES
 SHOW [FULL] PROCESSLIST
@@ -14834,6 +14854,53 @@
 
       </section>
 
+      <section id="show-create-procedure">
+
+        <title>&title-show-create-procedure;</title>
+
+        <indexterm type="function">
+          <primary>SHOW CREATE PROCEDURE</primary>
+        </indexterm>
+
+        <indexterm type="function">
+          <primary>SHOW CREATE FUNCTION</primary>
+        </indexterm>
+
+        <remark role="help-topic" condition="SHOW CREATE PROCEDURE"/>
+
+        <remark role="help-keywords">
+          SHOW CREATE PROCEDURE FUNCTION
+        </remark>
+
+        <remark role="help-syntax"/>
+
+<programlisting>
+SHOW CREATE {PROCEDURE | FUNCTION} <replaceable>sp_name</replaceable>
+</programlisting>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          This statement is a MySQL extension. Similar to <literal>SHOW
+          CREATE TABLE</literal>, it returns the exact string that can
+          be used to re-create the named routine.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SHOW CREATE FUNCTION test.hello\G</userinput>
+*************************** 1. row ***************************
+       Function: hello
+       sql_mode:
+Create Function: CREATE FUNCTION `test`.`hello`(s CHAR(20)) RETURNS CHAR(50)
+RETURN CONCAT('Hello, ',s,'!')
+</programlisting>
+
+      </section>
+
       <section id="show-create-table">
 
         <title>&title-show-create-table;</title>
@@ -15647,6 +15714,67 @@
 
       </section>
 
+      <section id="show-procedure-status">
+
+        <title>&title-show-procedure-status;</title>
+
+        <indexterm type="function">
+          <primary>SHOW PROCEDURE STATUS</primary>
+        </indexterm>
+
+        <indexterm type="function">
+          <primary>SHOW FUNCTION STATUS</primary>
+        </indexterm>
+
+        <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW PROCEDURE FUNCTION STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
+<programlisting>
+SHOW {PROCEDURE | FUNCTION} STATUS [LIKE '<replaceable>pattern</replaceable>']
+</programlisting>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          This statement is a MySQL extension. It returns
+          characteristics of routines, such as the database, name, type,
+          creator, and creation and modification dates. If no pattern is
+          specified, the information for all stored procedures or all
+          stored functions is listed, depending on which statement you
+          use.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+*************************** 1. row ***************************
+           Db: test
+         Name: hello
+         Type: FUNCTION
+      Definer: testuser@localhost
+     Modified: 2004-08-03 15:29:37
+      Created: 2004-08-03 15:29:37
+Security_type: DEFINER
+      Comment:
+</programlisting>
+
+        <para>
+          You can also get information about stored routines from the
+          <literal>ROUTINES</literal> table in
+          <literal>INFORMATION_SCHEMA</literal>. See
+          <xref linkend="routines-table"/>.
+        </para>
+
+      </section>
+
       <section id="show-processlist">
 
         <title>&title-show-processlist;</title>

Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2006-01-28 19:13:01 UTC (rev 1079)
+++ trunk/refman-5.0/stored-procedures.xml	2006-01-28 19:13:23 UTC (rev 1080)
@@ -749,113 +749,6 @@
 
     </section>
 
-    <section id="show-create-procedure">
-
-      <title>&title-show-create-procedure;</title>
-
-      <indexterm type="function">
-        <primary>SHOW CREATE PROCEDURE</primary>
-      </indexterm>
-
-      <indexterm type="function">
-        <primary>SHOW CREATE FUNCTION</primary>
-      </indexterm>
-
-      <remark role="help-topic" condition="SHOW CREATE PROCEDURE"/>
-
-      <remark role="help-keywords">
-        SHOW CREATE PROCEDURE FUNCTION
-      </remark>
-
-      <remark role="help-syntax"/>
-
-<programlisting>
-SHOW CREATE {PROCEDURE | FUNCTION} <replaceable>sp_name</replaceable>
-</programlisting>
-
-      <remark role="help-description-begin"/>
-
-      <para>
-        This statement is a MySQL extension. Similar to <literal>SHOW
-        CREATE TABLE</literal>, it returns the exact string that can be
-        used to re-create the named routine.
-      </para>
-
-      <remark role="help-description-end"/>
-
-      <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SHOW CREATE FUNCTION test.hello\G</userinput>
-*************************** 1. row ***************************
-       Function: hello
-       sql_mode:
-Create Function: CREATE FUNCTION `test`.`hello`(s CHAR(20)) RETURNS CHAR(50)
-RETURN CONCAT('Hello, ',s,'!')
-</programlisting>
-
-    </section>
-
-    <section id="show-procedure-status">
-
-      <title>&title-show-procedure-status;</title>
-
-      <indexterm type="function">
-        <primary>SHOW PROCEDURE STATUS</primary>
-      </indexterm>
-
-      <indexterm type="function">
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
-      <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
-
-      <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
-      </remark>
-
-      <remark role="help-syntax"/>
-
-<programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS [LIKE '<replaceable>pattern</replaceable>']
-</programlisting>
-
-      <remark role="help-description-begin"/>
-
-      <para>
-        This statement is a MySQL extension. It returns characteristics
-        of routines, such as the database, name, type, creator, and
-        creation and modification dates. If no pattern is specified, the
-        information for all stored procedures or all stored functions is
-        listed, depending on which statement you use.
-      </para>
-
-      <remark role="help-description-end"/>
-
-      <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
-*************************** 1. row ***************************
-           Db: test
-         Name: hello
-         Type: FUNCTION
-      Definer: testuser@localhost
-     Modified: 2004-08-03 15:29:37
-      Created: 2004-08-03 15:29:37
-Security_type: DEFINER
-      Comment:
-</programlisting>
-
-      <para>
-        You can also get information about stored routines from the
-        <literal>ROUTINES</literal> table in
-        <literal>INFORMATION_SCHEMA</literal>. See
-        <xref linkend="routines-table"/>.
-      </para>
-
-    </section>
-
     <section id="call">
 
       <title>&title-call;</title>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-28 19:13:01 UTC (rev 1079)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-28 19:13:23 UTC (rev 1080)
@@ -14873,6 +14873,14 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW CREATE FUNCTION</primary>
+      </indexterm>
+
+      <indexterm type="function">
+        <primary>SHOW CREATE PROCEDURE</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW CREATE SCHEMA</primary>
       </indexterm>
 
@@ -14905,6 +14913,10 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW FUNCTION STATUS</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW GRANTS</primary>
       </indexterm>
 
@@ -14933,6 +14945,10 @@
       </indexterm>
 
       <indexterm type="function">
+        <primary>SHOW PROCEDURE STATUS</primary>
+      </indexterm>
+
+      <indexterm type="function">
         <primary>SHOW PROCESSLIST</primary>
       </indexterm>
 
@@ -14974,7 +14990,7 @@
         COLUMNS LIKE TABLES OPEN FROM INDEX INDEXES STATUS VARIABLES
         DATABASE SCHEMA DATABASES SCHEMAS LOGS FULL PROCESSLIST FOR
         GRANTS TABLE CREATE WARNINGS ERRORS TYPES FIELDS HOSTS KEYS
-        ENGINE ENGINES INNODB PLUGIN
+        ENGINE ENGINES INNODB FUNCTION PROCEDURE PLUGIN
       </remark>
 
       <remark role="help-description-begin"/>
@@ -14988,14 +15004,18 @@
 <programlisting>
 SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 SHOW CREATE DATABASE <replaceable>db_name</replaceable>
+SHOW CREATE FUNCTION <replaceable>funcname</replaceable>
+SHOW CREATE PROCEDURE <replaceable>procname</replaceable>
 SHOW CREATE TABLE <replaceable>tbl_name</replaceable>
 SHOW DATABASES [LIKE '<replaceable>pattern</replaceable>']
 SHOW ENGINE <replaceable>engine_name</replaceable> {LOGS | STATUS }
 SHOW [STORAGE] ENGINES
 SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
+SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
 SHOW GRANTS FOR <replaceable>user</replaceable>
 SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
 SHOW INNODB STATUS
+SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
 SHOW [BDB] LOGS
 SHOW PLUGIN
 SHOW PRIVILEGES
@@ -15312,6 +15332,53 @@
 
       </section>
 
+      <section id="show-create-procedure">
+
+        <title>&title-show-create-procedure;</title>
+
+        <indexterm type="function">
+          <primary>SHOW CREATE PROCEDURE</primary>
+        </indexterm>
+
+        <indexterm type="function">
+          <primary>SHOW CREATE FUNCTION</primary>
+        </indexterm>
+
+        <remark role="help-topic" condition="SHOW CREATE PROCEDURE"/>
+
+        <remark role="help-keywords">
+          SHOW CREATE PROCEDURE FUNCTION
+        </remark>
+
+        <remark role="help-syntax"/>
+
+<programlisting>
+SHOW CREATE {PROCEDURE | FUNCTION} <replaceable>sp_name</replaceable>
+</programlisting>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          This statement is a MySQL extension. Similar to <literal>SHOW
+          CREATE TABLE</literal>, it returns the exact string that can
+          be used to re-create the named routine.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SHOW CREATE FUNCTION test.hello\G</userinput>
+*************************** 1. row ***************************
+       Function: hello
+       sql_mode:
+Create Function: CREATE FUNCTION `test`.`hello`(s CHAR(20)) RETURNS CHAR(50)
+RETURN CONCAT('Hello, ',s,'!')
+</programlisting>
+
+      </section>
+
       <section id="show-create-table">
 
         <title>&title-show-create-table;</title>
@@ -16174,6 +16241,67 @@
 
       </section>
 
+      <section id="show-procedure-status">
+
+        <title>&title-show-procedure-status;</title>
+
+        <indexterm type="function">
+          <primary>SHOW PROCEDURE STATUS</primary>
+        </indexterm>
+
+        <indexterm type="function">
+          <primary>SHOW FUNCTION STATUS</primary>
+        </indexterm>
+
+        <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW PROCEDURE FUNCTION STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
+<programlisting>
+SHOW {PROCEDURE | FUNCTION} STATUS [LIKE '<replaceable>pattern</replaceable>']
+</programlisting>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          This statement is a MySQL extension. It returns
+          characteristics of routines, such as the database, name, type,
+          creator, and creation and modification dates. If no pattern is
+          specified, the information for all stored procedures or all
+          stored functions is listed, depending on which statement you
+          use.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
+*************************** 1. row ***************************
+           Db: test
+         Name: hello
+         Type: FUNCTION
+      Definer: testuser@localhost
+     Modified: 2004-08-03 15:29:37
+      Created: 2004-08-03 15:29:37
+Security_type: DEFINER
+      Comment:
+</programlisting>
+
+        <para>
+          You can also get information about stored routines from the
+          <literal>ROUTINES</literal> table in
+          <literal>INFORMATION_SCHEMA</literal>. See
+          <xref linkend="routines-table"/>.
+        </para>
+
+      </section>
+
       <section id="show-processlist">
 
         <title>&title-show-processlist;</title>

Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-01-28 19:13:01 UTC (rev 1079)
+++ trunk/refman-5.1/stored-procedures.xml	2006-01-28 19:13:23 UTC (rev 1080)
@@ -721,113 +721,6 @@
 
     </section>
 
-    <section id="show-create-procedure">
-
-      <title>&title-show-create-procedure;</title>
-
-      <indexterm type="function">
-        <primary>SHOW CREATE PROCEDURE</primary>
-      </indexterm>
-
-      <indexterm type="function">
-        <primary>SHOW CREATE FUNCTION</primary>
-      </indexterm>
-
-      <remark role="help-topic" condition="SHOW CREATE PROCEDURE"/>
-
-      <remark role="help-keywords">
-        SHOW CREATE PROCEDURE FUNCTION
-      </remark>
-
-      <remark role="help-syntax"/>
-
-<programlisting>
-SHOW CREATE {PROCEDURE | FUNCTION} <replaceable>sp_name</replaceable>
-</programlisting>
-
-      <remark role="help-description-begin"/>
-
-      <para>
-        This statement is a MySQL extension. Similar to <literal>SHOW
-        CREATE TABLE</literal>, it returns the exact string that can be
-        used to re-create the named routine.
-      </para>
-
-      <remark role="help-description-end"/>
-
-      <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SHOW CREATE FUNCTION test.hello\G</userinput>
-*************************** 1. row ***************************
-       Function: hello
-       sql_mode:
-Create Function: CREATE FUNCTION `test`.`hello`(s CHAR(20)) RETURNS CHAR(50)
-RETURN CONCAT('Hello, ',s,'!')
-</programlisting>
-
-    </section>
-
-    <section id="show-procedure-status">
-
-      <title>&title-show-procedure-status;</title>
-
-      <indexterm type="function">
-        <primary>SHOW PROCEDURE STATUS</primary>
-      </indexterm>
-
-      <indexterm type="function">
-        <primary>SHOW FUNCTION STATUS</primary>
-      </indexterm>
-
-      <remark role="help-topic" condition="SHOW PROCEDURE STATUS"/>
-
-      <remark role="help-keywords">
-        SHOW PROCEDURE FUNCTION STATUS
-      </remark>
-
-      <remark role="help-syntax"/>
-
-<programlisting>
-SHOW {PROCEDURE | FUNCTION} STATUS [LIKE '<replaceable>pattern</replaceable>']
-</programlisting>
-
-      <remark role="help-description-begin"/>
-
-      <para>
-        This statement is a MySQL extension. It returns characteristics
-        of routines, such as the database, name, type, creator, and
-        creation and modification dates. If no pattern is specified, the
-        information for all stored procedures or all stored functions is
-        listed, depending on which statement you use.
-      </para>
-
-      <remark role="help-description-end"/>
-
-      <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SHOW FUNCTION STATUS LIKE 'hello'\G</userinput>
-*************************** 1. row ***************************
-           Db: test
-         Name: hello
-         Type: FUNCTION
-      Definer: testuser@localhost
-     Modified: 2004-08-03 15:29:37
-      Created: 2004-08-03 15:29:37
-Security_type: DEFINER
-      Comment:
-</programlisting>
-
-      <para>
-        You can also get information about stored routines from the
-        <literal>ROUTINES</literal> table in
-        <literal>INFORMATION_SCHEMA</literal>. See
-        <xref linkend="routines-table"/>.
-      </para>
-
-    </section>
-
     <section id="call">
 
       <title>&title-call;</title>

Thread
svn commit - mysqldoc@docsrva: r1080 - in trunk: . refman-5.0 refman-5.1paul28 Jan