List:Commits« Previous MessageNext Message »
From:jon Date:January 4 2007 12:32pm
Subject:svn commit - mysqldoc@docsrva: r4380 - branches/telcos/refman-5.1 trunk/refman-5.1
View as plain text  
Author: jstephens
Date: 2007-01-04 12:32:41 +0100 (Thu, 04 Jan 2007)
New Revision: 4380

Log:

Merged telco-applicable changes since 2006-12-20 from refman-5.1-main to telco 
branch.

Regenerated refman-telco errmsgs-client and errmsgs-server files from 
mysql-5.1-telco/6.1.0 sources. (Those are a couple of nice scripts you have 
there, Paul - even I could figure out how to use them.)

Some misc. typo and formatting fixes.



Modified:
   branches/telcos/refman-5.1/apis-c.xml
   branches/telcos/refman-5.1/connector-j.xml
   branches/telcos/refman-5.1/connector-mxj.xml
   branches/telcos/refman-5.1/connector-net.xml
   branches/telcos/refman-5.1/connector-odbc.xml
   branches/telcos/refman-5.1/errmsgs-client.xml
   branches/telcos/refman-5.1/errmsgs-server.xml
   branches/telcos/refman-5.1/functions.xml
   branches/telcos/refman-5.1/introduction.xml
   branches/telcos/refman-5.1/news-5.1.xml
   branches/telcos/refman-5.1/problems.xml
   branches/telcos/refman-5.1/se-federated.xml
   branches/telcos/refman-5.1/se-innodb.xml
   branches/telcos/refman-5.1/sql-syntax.xml
   branches/telcos/refman-5.1/using-mysql-programs.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/news-5.1.xml


Modified: branches/telcos/refman-5.1/apis-c.xml
===================================================================
--- branches/telcos/refman-5.1/apis-c.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/apis-c.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 3, Lines Added: 54, Lines Deleted: 15; 3962 bytes

@@ -3788,8 +3788,9 @@
       </para>
 
       <para>
-        More precisely, <literal>mysql_insert_id()</literal> is updated
-        under these conditions:
+        The return value of <literal>mysql_insert_id()</literal> is
+        always zero unless explicitly updated under one of the following
+        conditions:
       </para>
 
       <itemizedlist>

@@ -3808,17 +3809,53 @@
         <listitem>
           <para>
             In the case of a multiple-row <literal>INSERT</literal>
-            statement, <literal>mysql_insert_id()</literal> returns the
+            statement, the return value of
+            <literal>mysql_insert_id()</literal> depends on the MySQL
+            server version.
+          </para>
+
+          <para>
+            In MySQL 5.1.12 and later, mysql_insert_id() returns the the
+            <emphasis
+              role="bold">first</emphasis>
+            automatically generated <literal>AUTO_INCREMENT</literal>
+            value that was <emphasis>successfully</emphasis> inserted.
+            In MySQL 5.1.11 and earlier,
+            <literal>mysql_insert_id()</literal> returns the
             <emphasis role="bold">first</emphasis> automatically
-            generated <literal>AUTO_INCREMENT</literal> value; if no
-            such value is generated, it returns the last
-            <emphasis role="bold">last</emphasis> explicit value
-            inserted into the <literal>AUTO_INCREMENT</literal> column.
+            generated <literal>AUTO_INCREMENT</literal> value,
+            regardless of whether the insertion of that value was
+            successful.
           </para>
+
+          <para>
+            If no rows are successfully inserted, then
+            <literal>mysql_insert_id()</literal> returns 0.
+          </para>
         </listitem>
 
         <listitem>
           <para>
+            Starting in MySQL 5.1.12, if an <literal>INSERT ...
+            SELECT</literal> statement is executed, and no automatically
+            generated value is successfully inserted, then
+            <literal>mysql_insert_id()</literal> returns the id of the
+            last inserted row.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Starting in MySQL 5.1.12, if an <literal>INSERT ...
+            SELECT</literal> statement uses
+           
<literal>LAST_INSERT_ID(<replaceable>expr</replaceable>)</literal>,
+            then <literal>mysql_insert_id()</literal> returnes
+            <literal>expr</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <literal>INSERT</literal> statements that generate an
             <literal>AUTO_INCREMENT</literal> value by inserting
            
<literal>LAST_INSERT_ID(<replaceable>expr</replaceable>)</literal>

@@ -3852,14 +3889,16 @@
 
       </itemizedlist>
 
-      <para>
-        Note that <literal>mysql_insert_id()</literal> returns
-        <literal>0</literal> if the previous statement does not use an
-        <literal>AUTO_INCREMENT</literal> value. If you need to save the
-        value for later, be sure to call
-        <literal>mysql_insert_id()</literal> immediately after the
-        statement that generates the value.
-      </para>
+      <note>
+        <para>
+          <literal>mysql_insert_id()</literal> returns
+          <literal>0</literal> if the previous statement does not use an
+          <literal>AUTO_INCREMENT</literal> value. If you need to save
+          the value for later, be sure to call
+          <literal>mysql_insert_id()</literal> immediately after the
+          statement that generates the value.
+        </para>
+      </note>
 
       <para>
         The value of <literal>mysql_insert_id()</literal> is affected


Modified: branches/telcos/refman-5.1/connector-j.xml
===================================================================
--- branches/telcos/refman-5.1/connector-j.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/connector-j.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 3, Lines Added: 62, Lines Deleted: 20; 3883 bytes

@@ -2126,6 +2126,46 @@
           </para>
 
           <para>
+            Starting with Connector/J version 3.1.0, you can emulate
+            Blobs with locators by adding the property
+            'emulateLocators=true' to your JDBC URL. Using this method,
+            the driver will delay loading the actual Blob data until you
+            retrieve the other data and then use retrieval methods
+            (<literal>getInputStream()</literal>,
+            <literal>getBytes()</literal>, and so forth) on the blob
+            data stream.
+          </para>
+
+          <para>
+            For this to work, you must use a column alias with the value
+            of the column to the actual name of the Blob, for example:
+          </para>
+
+<programlisting>SELECT id, data as 'data' from blobtable</programlisting>
+
+          <para>
+            For this to work, you must also follow follow these rules:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                The <literal>SELECT</literal> must also reference only
+                one table, the table must have a primary key.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The <literal>SELECT</literal> must cover all columns
+                that make up the primary key.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
             The Blob implementation does not allow in-place modification
             (they are copies, as reported by the
             <literal>DatabaseMetaData.locatorsUpdateCopies()</literal>

@@ -2135,22 +2175,6 @@
             updatable result sets) methods to save changes back to the
             database.
           </para>
-
-          <para>
-            Starting with Connector/J version 3.1.0, you can emulate
-            Blobs with locators by adding the property
-            'emulateLocators=true' to your JDBC URL. You must then use a
-            column alias with the value of the column set to the actual
-            name of the Blob column in the <literal>SELECT</literal>
-            that you write to retrieve the Blob. The
-            <literal>SELECT</literal> must also reference only one
-            table, the table must have a primary key, and the
-            <literal>SELECT</literal> must cover all columns that make
-            up the primary key. The driver will then delay loading the
-            actual Blob data until you retrieve the Blob and call
-            retrieval methods (<literal>getInputStream()</literal>,
-            <literal>getBytes()</literal>, and so forth) on it.
-          </para>
         </listitem>
 
         <listitem>

@@ -4597,13 +4621,31 @@
 
       </section>
 
-<!--
-      <section id="connector-j-usagenotes-hibernate-config">
+      <section id="connector-j-usagenotes-hibernate">
+
         <title>Using Connector/J with Hibernate</title>
 
-        <para></para>
+        <para>
+          This section details and information when using Connector/J
+          with the
+          <ulink url="http://www.hibernate.org/">Hibernate</ulink>
+          framework.
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Within Hibernate, do not enable the
+              <literal>use_sql_comments</literal> option, as this can
+              introduce comments before the real SQL statements that
+              may confuse the parsing mechanism in Connector/J.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
       </section>
--->
 
 <!--
       <section id="connector-j-usagenotes-spring-config">


Modified: branches/telcos/refman-5.1/connector-mxj.xml
===================================================================
--- branches/telcos/refman-5.1/connector-mxj.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/connector-mxj.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1004 bytes

@@ -474,7 +474,7 @@
 
         <listitem>
           <para>
-            Download Connector/MXJ copy the
+            Download Connector/MXJ and copy the
             <filename>connector-mxj.jar</filename> file to the
             <filename>$JBOSS_HOME/server/default/lib</filename>
             directory.

@@ -483,8 +483,8 @@
 
         <listitem>
           <para>
-            Download Connector/J copy the
-            <filename>connector-mxj.jar</filename> file to the
+            Download Connector/J and copy the
+           
<filename>mysql-connector-java-<replaceable>5.0.4</replaceable>-bin.jar</filename>
file to the
             <filename>$JBOSS_HOME/server/default/lib</filename>
             directory.
           </para>


Modified: branches/telcos/refman-5.1/connector-net.xml
===================================================================
--- branches/telcos/refman-5.1/connector-net.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/connector-net.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 759 bytes

@@ -136,6 +136,8 @@
 
     </itemizedlist>
 
+<note><para>Version numbers for MySQL products are formatted as X.X.X.
However, Windows tools (Control Panel, properties display) may show the version numbers
as XX.XX.XX. For example, the official MySQL formatted version number 5.0.9 may be
displayed by Windows tools as 5.00.09. The two versions are the same; only the number
display format is different. </para></note>
+
   </section>
 
   <section id="connector-net-installation">


Modified: branches/telcos/refman-5.1/connector-odbc.xml
===================================================================
--- branches/telcos/refman-5.1/connector-odbc.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/connector-odbc.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 3; 1316 bytes

@@ -153,14 +153,17 @@
 
       </itemizedlist>
 
-      <para>
-        Note: From this section onward, the primary focus of this guide
+     <note> <para>
+        From this section onward, the primary focus of this guide
         is the Connector/ODBC 3.51 driver. More information about the
-        MyODBC 2.50 driver in the documentation included in the
+        MyODBC 2.50 driver is in the documentation included in the
         installation packages for that version. If there is a specific
         issue (error or known problem) that only affects the 2.50
         version, it may be included here for reference.
       </para>
+</note>
+     
+<note><para>Version numbers for MySQL products are formatted as X.X.X.
However, Windows tools (Control Panel, properties display) may show the version numbers
as XX.XX.XX. For example, the official MySQL formatted version number 5.0.9 may be
displayed by Windows tools as 5.00.09. The two versions are the same; only the number
display format is different. </para></note>
 
     </section>
 


Modified: branches/telcos/refman-5.1/errmsgs-client.xml
===================================================================
--- branches/telcos/refman-5.1/errmsgs-client.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/errmsgs-client.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 604 bytes

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_CLIENT_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
-<!-- To regenerate, use ../tools/make-errmsgs-client.pl -->
+<!-- To regenerate, use ./make-errmsgs-client.pl -->
 <itemizedlist>
 
   <listitem>


Modified: branches/telcos/refman-5.1/errmsgs-server.xml
===================================================================
--- branches/telcos/refman-5.1/errmsgs-server.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/errmsgs-server.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 604 bytes

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_SERVER_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
-<!-- To regenerate, use ../tools/make-errmsgs-server.pl -->
+<!-- To regenerate, use ./make-errmsgs-server.pl -->
 <itemizedlist>
 
   <listitem>


Modified: branches/telcos/refman-5.1/functions.xml
===================================================================
--- branches/telcos/refman-5.1/functions.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/functions.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 2, Lines Added: 31, Lines Deleted: 8; 2700 bytes

@@ -13968,14 +13968,19 @@
           <remark role="help-description-begin"/>
 
           <para>
-            <literal>LAST_INSERT_ID()</literal> (with no argument)
-            returns the <emphasis>first</emphasis> automatically
-            generated value that was set for an
-            <literal>AUTO_INCREMENT</literal> column by the
-            <emphasis>most recently executed</emphasis>
-            <literal>INSERT</literal> or
<literal>UPDATE</literal>
-            statement to affect such a column. For example, after
-            inserting a row that generates an
+            For MySQL 5.1.12 and later,
+            <literal>LAST_INSERT_ID()</literal> (no arguments) returns
+            the <emphasis>first</emphasis> automatically generated value
+            <emphasis>successfully</emphasis> inserted or updated for an
+            <literal>AUTO_INCREMENT</literal> column as a result of the
+            most recently exercuted <literal>INSERT</literal> or
+            <literal>UPDATE</literal> statement. The value of
+            <literal>LAST_INSERT_ID()</literal> remains unchanged if no
+            rows are successfully inserted.
+          </para>
+
+          <para>
+            For example, after inserting a row that generates an
             <literal>AUTO_INCREMENT</literal> value, you can get the
             value like this:
           </para>

@@ -13986,6 +13991,24 @@
 </programlisting>
 
           <para>
+            In MySQL 5.1.11 and earlier,
+            <literal>LAST_INSERT_ID()</literal> (no arguments) returns
+            the <emphasis>first</emphasis> automatically generated value
+            if any rows were successfully inserted or updated. This
+            means that the returned value could be a value that was not
+            successfully inserted into the table. If no rows were
+            successfully inserted, <literal>LAST_INSERT_ID()</literal>
+            returns 0.
+          </para>
+
+          <para>
+            The value of <literal>LAST_INSERT_ID()</literal> will be
+            consistent across all versions if all rows in the
+            <literal>INSERT</literal> or
<literal>UPDATE</literal>
+            statement were successful.
+          </para>
+
+          <para>
             The currently executing statement does not affect the value
             of <literal>LAST_INSERT_ID()</literal>. Suppose that you
             generate an <literal>AUTO_INCREMENT</literal> value with one


Modified: branches/telcos/refman-5.1/introduction.xml
===================================================================
--- branches/telcos/refman-5.1/introduction.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/introduction.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 648 bytes

@@ -1348,7 +1348,7 @@
               </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT @a:=SUM(total),@b=COUNT(*),@a/@b AS
avg</userinput>
+mysql&gt; <userinput>SELECT @a:=SUM(total),@b:=COUNT(*),@a/@b AS
avg</userinput>
     -&gt; <userinput>FROM test_table;</userinput>
 mysql&gt; <userinput>SELECT @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3;</userinput>
 </programlisting>


Modified: branches/telcos/refman-5.1/news-5.1.xml
===================================================================
--- branches/telcos/refman-5.1/news-5.1.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/news-5.1.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 5, Lines Added: 28, Lines Deleted: 9; 3231 bytes

@@ -229,8 +229,9 @@
       installing any new version of software. Although MySQL has worked
       very hard to ensure a high level of quality, protect your data by
       making a backup as you would for any software beta release. Please
-      refer to our bug database at <ulink url="http://bugs.mysql.com/"/>
-      for more details about the individual bugs fixed in this version.
+      refer to our bug database at
+      <ulink url="http://bugs.mysql.com/"/> for more details about the 
+      individual bugs fixed in this version.
     </para>
 
     <para>

@@ -436,15 +437,33 @@
     </para>
 
     <itemizedlist>
-      
+
       <listitem>
         <para>
+          <literal>NDB Cluster</literal>: Setting the configuration
+          parameter <literal>LockPagesInMainMemory</literal> had no
+          effect. (Bug #24461)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <literal>NDB Cluster</literal>: Multiple occurrences of error
+          conditions were logged with duplicat error messages rather
+          than being being reported with a single error message stating
+          that the error was encountered <replaceable>N</replaceable>
+          times. (Bug #22313)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <literal>NDB Cluster</literal>: Sudden disconnection of an SQL
           or data node could lead to shutdown of data nodes with the
           error <errortext>failed ndbrequire</errortext>. (Bug #24447)
         </para>
       </listitem>
-      
+
       <listitem>
         <para>
           <literal>NDB Cluster</literal>: Different error messages were

@@ -452,13 +471,13 @@
           memory for Cluster operations. (Bug #19203)
         </para>
       </listitem>
-      
+
       <listitem>
         <para>
           <literal>NDB Cluster</literal>: Some values of
           <literal>MaxNoOfTriggers</literal> could cause the server to
           become inaccessible following startup of of the data nodes.
-          (Bug #19454) 
+          (Bug #19454)
         </para>
       </listitem>
 

@@ -2602,8 +2621,8 @@
         <para>
           The <literal>LOAD DATA FROM MASTER</literal> and
<literal>LOAD
           TABLE FROM MASTER</literal> statements are deprecated. See
-          <xref linkend="load-data-from-master"/>, for recommended
-          alternatives. (Bug #18822, Bug #9125, Bug #12187, Bug #14399,
+          <xref linkend="load-data-from-master"/>, for recommended 
+          alternatives. (Bug #18822, Bug #9125, Bug #12187, Bug #14399, 
           Bug #15025, Bug #20596)
         </para>
       </listitem>

@@ -3629,7 +3648,7 @@
           <quote>skip</quote> executions. For example, an event defined
           with <literal>EVERY 1 SECOND</literal> &mdash; but which
           required longer than 1 second to complete &mdash; might be
-          excuted only once every 2 seconds. (Bug #16417)
+          executed only once every 2 seconds. (Bug #16417)
         </para>
       </listitem>
 


Modified: branches/telcos/refman-5.1/problems.xml
===================================================================
--- branches/telcos/refman-5.1/problems.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/problems.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 556 bytes

@@ -507,7 +507,7 @@
 
           <para>
             Under Linux or Unix, check your IP tables (or similar)
-            configuration to ensure that the the port has been blocked.
+            configuration to ensure that the port has not been blocked.
           </para>
 
           <para>


Modified: branches/telcos/refman-5.1/se-federated.xml
===================================================================
--- branches/telcos/refman-5.1/se-federated.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/se-federated.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 855 bytes

@@ -321,6 +321,17 @@
 
       <listitem>
         <para>
+          Performance on a <literal>FEDERATED</literal> table when
+          performing bulk inserts (for example, on a <literal>INSERT
+          INTO ... SELECT ...</literal> statement) is slower than with
+          other table types because each selected row is treated as an
+          individual <literal>INSERT</literal> statement on the
+          federated table.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           There is no support for transactions.
         </para>
       </listitem>


Modified: branches/telcos/refman-5.1/se-innodb.xml
===================================================================
--- branches/telcos/refman-5.1/se-innodb.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/se-innodb.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 11; 1945 bytes

@@ -1649,16 +1649,13 @@
         </para>
 
         <para>
-          <literal>InnoDB</literal> honors <literal>LOCK
-          TABLES</literal>; MySQL does not return from <literal>LOCK
-          TABLE .. WRITE</literal> until all other threads have released
-          all their locks to the table. The default value is 1, which
-          means that <literal>LOCK TABLES</literal> causes
-          <literal>InnoDB</literal> to lock a table internally. In
-          applications using <literal>AUTOCOMMIT=1</literal>,
-          <literal>InnoDB</literal>'s internal table locks can cause
-          deadlocks. You can set <literal>innodb_table_locks=0</literal>
-          in the server option file to remove that problem.
+          If <literal>AUTOCOMMIT=0</literal>,
<literal>InnoDB</literal>
+          honors <literal>LOCK TABLES</literal>; MySQL does not return
+          from <literal>LOCK TABLE .. WRITE</literal> until all other
+          threads have released all their locks to the table. The
+          default value of <literal>innodb_table_locks</literal> is 1,
+          which means that <literal>LOCK TABLES</literal> causes InnoDB
+          to lock a table internally if <literal>AUTOCOMMIT=0</literal>.
         </para>
       </listitem>
 

@@ -2213,7 +2210,7 @@
 
       <para>
         <literal>InnoDB</literal> uses the in-memory auto-increment
-        counter as long as he server runs. When the server is stopped
+        counter as long as the server runs. When the server is stopped
         and restarted, <literal>InnoDB</literal> reinitializes the
         counter for each table for the first <literal>INSERT</literal>
         to the table, as described earlier.


Modified: branches/telcos/refman-5.1/sql-syntax.xml
===================================================================
--- branches/telcos/refman-5.1/sql-syntax.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/sql-syntax.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 5; 2263 bytes

@@ -3232,9 +3232,9 @@
       <para>
         <replaceable>partition_options</replaceable> can be used to
         control partitioning of the table created with <literal>CREATE
-        TABLE</literal>. <emphasis role="bold">Important</emphasis>:
-        Not all options shown in the syntax for
-        <replaceable>partition_options</replaceable> at the beginning of  
+        TABLE</literal>. <emphasis role="bold">Important</emphasis>:
Not
+        all options shown in the syntax for
+        <replaceable>partition_options</replaceable> at the beginning of
         this section are available for all partitioning types. Please
         see the listings for the following individual types for
         information specific to each type, and see

@@ -3243,7 +3243,7 @@
         well as additional examples of table creation and other
         statements relating to MySQL partitioning.
       </para>
-      
+
       <para>
         If used, <replaceable>partition_options</replaceable> must
         contain at a minimum a <literal>PARTITION BY</literal> clause.

@@ -10655,7 +10655,8 @@
           Subqueries in the <literal>FROM</literal> clause can return a
           scalar, column, row, or table. Subqueries in the
           <literal>FROM</literal> clause cannot be correlated
-          subqueries.
+          subqueries, unless used within the <literal>ON</literal> clause of
a
+          <literal>JOIN</literal> operation. 
         </para>
 
         <para>

@@ -16568,6 +16569,16 @@
             tables that have foreign keys that are referred to by other
             tables.
           </para>
+
+          <note>
+            <para>
+              Setting <literal>FOREIGN_KEY_CHECKS</literal> to 1 does
+              not trigger a scan of the existing table data. Therefore,
+              rows added to the table while
+              <literal>FOREIGN_KEY_CHECKS=0</literal> will not be
+              verified for consistency.
+            </para>
+          </note>
         </listitem>
 
         <listitem>


Modified: branches/telcos/refman-5.1/using-mysql-programs.xml
===================================================================
--- branches/telcos/refman-5.1/using-mysql-programs.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ branches/telcos/refman-5.1/using-mysql-programs.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes

@@ -1529,7 +1529,7 @@
         a multiplier of 1024, 1024<superscript>2</superscript> or
         1024<superscript>3</superscript>. (For example, when used to set
         <literal>max_allowed_packet</literal>, the suffixes indicate
-        units of kilobytes, megabytes, or gigabygtes.)
+        units of kilobytes, megabytes, or gigabytes.)
       </para>
 
       <para>


Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ trunk/refman-5.1/connector-odbc.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 758 bytes

@@ -156,7 +156,7 @@
      <note> <para>
         From this section onward, the primary focus of this guide
         is the Connector/ODBC 3.51 driver. More information about the
-        MyODBC 2.50 driver in the documentation included in the
+        MyODBC 2.50 driver is in the documentation included in the
         installation packages for that version. If there is a specific
         issue (error or known problem) that only affects the 2.50
         version, it may be included here for reference.


Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml	2007-01-04 10:52:02 UTC (rev 4379)
+++ trunk/refman-5.1/news-5.1.xml	2007-01-04 11:32:41 UTC (rev 4380)
Changed blocks: 5, Lines Added: 11, Lines Deleted: 14; 2296 bytes

@@ -119,9 +119,7 @@
           <filename>httpd.conf</filename> commonly distributed with
           Apache. For more information about
           <literal>MaxClient</literal>, see
-          <ulink
-            url="http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxclients"
-          />.)
+          <ulink
url="http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxclients"/>.)
         </para>
 
         <para>

@@ -650,9 +648,8 @@
       very hard to ensure a high level of quality, protect your data by
       making a backup as you would for any software beta release. Please
       refer to our bug database at
-      <ulink
-        url="http://bugs.mysql.com/"/> for more details
-      about the individual bugs fixed in this version.
+      <ulink url="http://bugs.mysql.com/"/> for more details about the 
+      individual bugs fixed in this version.
     </para>
 
     <para>

@@ -841,9 +838,7 @@
 
         <para>
           See <xref linkend="create-event"/>, and
-          <xref
-            linkend="alter-event"/>, for more specific
-          information.
+          <xref linkend="alter-event"/>, for more specific information.
         </para>
       </listitem>
 

@@ -2291,7 +2286,10 @@
   <section id="news-5-1-12">
 
     <title>Changes in release 5.1.12 (24 October 2006)</title>
-    &warning-5-1-12; <para role="release-level">
+
+    &warning-5-1-12; 
+
+    <para role="release-level">
       This is a new Beta development release, fixing recently discovered
       bugs.
     </para>

@@ -3050,10 +3048,9 @@
         <para>
           The <literal>LOAD DATA FROM MASTER</literal> and
<literal>LOAD
           TABLE FROM MASTER</literal> statements are deprecated. See
-          <xref
-            linkend="load-data-from-master"/>, for
-          recommended alternatives. (Bug #18822, Bug #9125, Bug #12187,
-          Bug #14399, Bug #15025, Bug #20596)
+          <xref linkend="load-data-from-master"/>, for recommended 
+          alternatives. (Bug #18822, Bug #9125, Bug #12187, Bug #14399, 
+          Bug #15025, Bug #20596)
         </para>
       </listitem>
 


Thread
svn commit - mysqldoc@docsrva: r4380 - branches/telcos/refman-5.1 trunk/refman-5.1jon4 Jan