List:Commits« Previous MessageNext Message »
From:paul Date:April 11 2007 2:50am
Subject:svn commit - mysqldoc@docsrva: r5820 - in trunk: . refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2007-04-11 04:50:18 +0200 (Wed, 11 Apr 2007)
New Revision: 5820

Log:
 r18893@frost:  paul | 2007-04-10 15:57:35 -0500
 SELECT ... INTO isn't just for user-defined variables.
 It applies to routine parameters, local variables when in
 a routine.


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

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


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2007-04-11 02:49:50 UTC (rev 5819)
+++ trunk/refman-5.0/sql-syntax.xml	2007-04-11 02:50:18 UTC (rev 5820)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 4; 1409 bytes

@@ -6499,7 +6499,7 @@
     [PROCEDURE <replaceable>procedure_name</replaceable>(<replaceable>argument_list</replaceable>)]
     [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
       | INTO DUMPFILE '<replaceable>file_name</replaceable>'
-      | INTO @<replaceable>var_name</replaceable> [, @<replaceable>var_name</replaceable>]]
+      | INTO <replaceable>var_name</replaceable> [, <replaceable>var_name</replaceable>]]
     [FOR UPDATE | LOCK IN SHARE MODE]]
 </programlisting>
 

@@ -7232,9 +7232,11 @@
         <listitem>
           <para>
             The <literal>INTO</literal> clause can name a list of one or
-            more user-defined variables. The selected values are
-            assigned to the variables. The number of variables must
-            match the number of columns.
+            more variables, which can be user-defined variables, or
+            parameters or local variables within a stored function or
+            procedure body. The selected values are assigned to the
+            variables. The number of variables must match the number of
+            columns.
           </para>
 
           <para>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2007-04-11 02:49:50 UTC (rev 5819)
+++ trunk/refman-5.1/sql-syntax.xml	2007-04-11 02:50:18 UTC (rev 5820)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 4; 1409 bytes

@@ -8197,7 +8197,7 @@
     [PROCEDURE <replaceable>procedure_name</replaceable>(<replaceable>argument_list</replaceable>)]
     [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
       | INTO DUMPFILE '<replaceable>file_name</replaceable>'
-      | INTO @<replaceable>var_name</replaceable> [, @<replaceable>var_name</replaceable>]]
+      | INTO <replaceable>var_name</replaceable> [, <replaceable>var_name</replaceable>]]
     [FOR UPDATE | LOCK IN SHARE MODE]]
 </programlisting>
 

@@ -8914,9 +8914,11 @@
         <listitem>
           <para>
             The <literal>INTO</literal> clause can name a list of one or
-            more user-defined variables. The selected values are
-            assigned to the variables. The number of variables must
-            match the number of columns.
+            more variables, which can be user-defined variables, or
+            parameters or local variables within a stored function or
+            procedure body. The selected values are assigned to the
+            variables. The number of variables must match the number of
+            columns.
           </para>
 
           <para>


Thread
svn commit - mysqldoc@docsrva: r5820 - in trunk: . refman-5.0 refman-5.1paul11 Apr