MySQL Lists: commits: svn commit - mysqldoc@docsrva: r11683 - in trunk: . refman-4.1 refman-5.1 refman-6.0

List:	Commits	« Previous Message Next Message »
From:	paul.dubois	Date:	September 5 2008 11:08pm
Subject:	svn commit - mysqldoc@docsrva: r11683 - in trunk: . refman-4.1 refman-5.1 refman-6.0
View as plain text
Author: paul
Date: 2008-09-05 23:08:51 +0200 (Fri, 05 Sep 2008)
New Revision: 11683

Log:
 r33660@frost:  paul | 2008-09-05 12:57:53 -0500
 Minor revisions


Modified:
   trunk/refman-4.1/sql-syntax-data-manipulation.xml
   trunk/refman-5.1/sql-syntax-data-manipulation.xml
   trunk/refman-6.0/sql-syntax-data-manipulation.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:33658
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32972
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33660
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32972


Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-09-05 17:45:06 UTC (rev 11682)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-09-05 21:08:51 UTC (rev 11683)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 9; 2647 bytes

@@ -699,7 +699,7 @@
     <title><literal>INSERT</literal> Syntax</title>
 
     <indexterm>
-      <primary>ON DUPLICATE KEY</primary>
+      <primary>ON DUPLICATE KEY UPDATE</primary>
     </indexterm>
 
     <indexterm>

@@ -1697,8 +1697,8 @@
       <para>
         If <literal>a=1 OR b=2</literal> matches several rows, only
         <emphasis>one</emphasis> row is updated. In general, you should
-        try to avoid using an <literal>ON DUPLICATE KEY</literal> clause
-        on tables with multiple unique indexes.
+        try to avoid using an <literal>ON DUPLICATE KEY UPDATE</literal>
+        clause on tables with multiple unique indexes.
       </para>
 
       <para>

@@ -1711,12 +1711,13 @@
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
         function in the <literal>UPDATE</literal> clause to refer to
         column values from the <literal>INSERT</literal> portion of the
-        <literal>INSERT ... UPDATE</literal> statement. In other words,
+        <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement.
+        In other words,
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
-        in the <literal>UPDATE</literal> clause refers to the value of
-        <replaceable>col_name</replaceable> that would be inserted, had
-        no duplicate-key conflict occurred. This function is especially
-        useful in multiple-row inserts. The
+        in the <literal>ON DUPLICATE KEY UPDATE</literal> clause refers
+        to the value of <replaceable>col_name</replaceable> that would
+        be inserted, had no duplicate-key conflict occurred. This
+        function is especially useful in multiple-row inserts. The
         <function role="sql">VALUES()</function> function is meaningful
         only in <literal>INSERT ... UPDATE</literal> statements and
         returns <literal>NULL</literal> otherwise. Example:

@@ -1740,7 +1741,8 @@
 
       <para>
         If a table contains an <literal>AUTO_INCREMENT</literal> column
-        and <literal>INSERT ... UPDATE</literal> inserts a row, the
+        and <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+        inserts a row, the
         <function role="sql">LAST_INSERT_ID()</function> function
         returns the <literal>AUTO_INCREMENT</literal> value. If the
         statement updates a row instead,


Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml	2008-09-05 17:45:06 UTC (rev 11682)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml	2008-09-05 21:08:51 UTC (rev 11683)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 9; 2647 bytes

@@ -671,7 +671,7 @@
     <title><literal>INSERT</literal> Syntax</title>
 
     <indexterm>
-      <primary>ON DUPLICATE KEY</primary>
+      <primary>ON DUPLICATE KEY UPDATE</primary>
     </indexterm>
 
     <indexterm>

@@ -1721,8 +1721,8 @@
       <para>
         If <literal>a=1 OR b=2</literal> matches several rows, only
         <emphasis>one</emphasis> row is updated. In general, you should
-        try to avoid using an <literal>ON DUPLICATE KEY</literal> clause
-        on tables with multiple unique indexes.
+        try to avoid using an <literal>ON DUPLICATE KEY UPDATE</literal>
+        clause on tables with multiple unique indexes.
       </para>
 
       <para>

@@ -1735,12 +1735,13 @@
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
         function in the <literal>UPDATE</literal> clause to refer to
         column values from the <literal>INSERT</literal> portion of the
-        <literal>INSERT ... UPDATE</literal> statement. In other words,
+        <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement.
+        In other words,
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
-        in the <literal>UPDATE</literal> clause refers to the value of
-        <replaceable>col_name</replaceable> that would be inserted, had
-        no duplicate-key conflict occurred. This function is especially
-        useful in multiple-row inserts. The
+        in the <literal>ON DUPLICATE KEY UPDATE</literal> clause refers
+        to the value of <replaceable>col_name</replaceable> that would
+        be inserted, had no duplicate-key conflict occurred. This
+        function is especially useful in multiple-row inserts. The
         <function role="sql">VALUES()</function> function is meaningful
         only in <literal>INSERT ... UPDATE</literal> statements and
         returns <literal>NULL</literal> otherwise. Example:

@@ -1764,7 +1765,8 @@
 
       <para>
         If a table contains an <literal>AUTO_INCREMENT</literal> column
-        and <literal>INSERT ... UPDATE</literal> inserts a row, the
+        and <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+        inserts a row, the
         <function role="sql">LAST_INSERT_ID()</function> function
         returns the <literal>AUTO_INCREMENT</literal> value. If the
         statement updates a row instead,


Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml	2008-09-05 17:45:06 UTC (rev 11682)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml	2008-09-05 21:08:51 UTC (rev 11683)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 9; 2647 bytes

@@ -671,7 +671,7 @@
     <title><literal>INSERT</literal> Syntax</title>
 
     <indexterm>
-      <primary>ON DUPLICATE KEY</primary>
+      <primary>ON DUPLICATE KEY UPDATE</primary>
     </indexterm>
 
     <indexterm>

@@ -1719,8 +1719,8 @@
       <para>
         If <literal>a=1 OR b=2</literal> matches several rows, only
         <emphasis>one</emphasis> row is updated. In general, you should
-        try to avoid using an <literal>ON DUPLICATE KEY</literal> clause
-        on tables with multiple unique indexes.
+        try to avoid using an <literal>ON DUPLICATE KEY UPDATE</literal>
+        clause on tables with multiple unique indexes.
       </para>
 
       <para>

@@ -1733,12 +1733,13 @@
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
         function in the <literal>UPDATE</literal> clause to refer to
         column values from the <literal>INSERT</literal> portion of the
-        <literal>INSERT ... UPDATE</literal> statement. In other words,
+        <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement.
+        In other words,
         <function
role="sql">VALUES(<replaceable>col_name</replaceable>)</function>
-        in the <literal>UPDATE</literal> clause refers to the value of
-        <replaceable>col_name</replaceable> that would be inserted, had
-        no duplicate-key conflict occurred. This function is especially
-        useful in multiple-row inserts. The
+        in the <literal>ON DUPLICATE KEY UPDATE</literal> clause refers
+        to the value of <replaceable>col_name</replaceable> that would
+        be inserted, had no duplicate-key conflict occurred. This
+        function is especially useful in multiple-row inserts. The
         <function role="sql">VALUES()</function> function is meaningful
         only in <literal>INSERT ... UPDATE</literal> statements and
         returns <literal>NULL</literal> otherwise. Example:

@@ -1762,7 +1763,8 @@
 
       <para>
         If a table contains an <literal>AUTO_INCREMENT</literal> column
-        and <literal>INSERT ... UPDATE</literal> inserts a row, the
+        and <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+        inserts a row, the
         <function role="sql">LAST_INSERT_ID()</function> function
         returns the <literal>AUTO_INCREMENT</literal> value. If the
         statement updates a row instead,
Thread
• svn commit - mysqldoc@docsrva: r11683 - in trunk: . refman-4.1 refman-5.1 refman-6.0	paul.dubois	5 Sep