List:Commits« Previous MessageNext Message »
From:paul Date:January 24 2006 4:50am
Subject:svn commit - mysqldoc@docsrva: r1012 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-24 05:50:25 +0100 (Tue, 24 Jan 2006)
New Revision: 1012

Log:
 r6620@frost:  paul | 2006-01-23 22:43:46 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/connector-mxj.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/connector-mxj.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/connector-mxj.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/custom-engine-build.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/connector-mxj.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -240,7 +240,7 @@
 
       <listitem>
         <para>
-          In order to run the JUnit test suite, the $CLASSPATH must
+          To run the JUnit test suite, the $CLASSPATH must
           include the following:
         </para>
 

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1422,7 +1422,7 @@
       <title>&title-myodbc-unix-thread-safe;</title>
 
       <para>
-        In order to link the driver with MySQL thread safe client
+        To link the driver with MySQL thread safe client
         libraries <filename>libmysqlclient_r.so</filename> or
         <filename>libmysqlclient_r.a</filename>, you must specify the
         following <command>configure</command> option:

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/database-administration.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -7165,8 +7165,8 @@
         <para>
           The MySQL server can operate in different SQL modes, and (as
           of MySQL 4.1) can apply these modes differentially for
-          different clients. This enables each application to tailor the
-          server's operating mode to its own requirements.
+          different clients. This capability enables each application to
+          tailor the server's operating mode to its own requirements.
         </para>
 
         <para>
@@ -7180,31 +7180,39 @@
           You can set the default SQL mode by starting
           <command>mysqld</command> with the
           <option>--sql-mode="<replaceable>modes</replaceable>"</option>
-          option. The value also can be empty
-          (<option>--sql-mode=""</option>) if you want to reset it.
+          option. <replaceable>modes</replaceable> is a list of
+          different modes separated by comma
+          (&lsquo;<literal>,</literal>&rsquo;) characters. The default
+          value is empty (no modes set). The
+          <replaceable>modes</replaceable> value also can be empty
+          (<option>--sql-mode=""</option>) if you want to clear it
+          explicitly.
         </para>
 
         <para>
-          Beginning with MySQL 4.1, you can also change the SQL mode
-          after startup time by setting the <literal>sql_mode</literal>
-          variable with a <literal>SET [SESSION|GLOBAL]
+          Beginning with MySQL 4.1, you can change the SQL mode at
+          runtime by using a <literal>SET [GLOBAL|SESSION]
           sql_mode='<replaceable>modes</replaceable>'</literal>
-          statement. Setting the <literal>GLOBAL</literal> variable
-          requires the <literal>SUPER</literal> privilege and affects
-          the operation of all clients that connect from that time on.
-          Setting the <literal>SESSION</literal> variable affects only
-          the current client. Any client can change its session
-          <literal>sql_mode</literal> value.
+          statement to set the <literal>sql_mode</literal> system value.
+          Setting the <literal>GLOBAL</literal> variable requires the
+          <literal>SUPER</literal> privilege and affects the operation
+          of all clients that connect from that time on. Setting the
+          <literal>SESSION</literal> variable affects only the current
+          client. Any client can change its own session
+          <literal>sql_mode</literal> value at any time.
         </para>
 
         <para>
-          <replaceable>modes</replaceable> is a list of different modes
-          separated by comma (&lsquo;<literal>,</literal>&rsquo;)
-          characters. You can retrieve the current mode by issuing a
-          <literal>SELECT @@sql_mode</literal> statement. The default
-          value is empty (no modes set).
+          You can retrieve the current global or session
+          <literal>sql_mode</literal> value with the following
+          statements:
         </para>
 
+<programlisting>
+SELECT @@global.sql_mode;
+SELECT @@session.sql_mode;
+</programlisting>
+
         <indexterm>
           <primary>ANSI SQL mode</primary>
         </indexterm>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/installing.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -6481,8 +6481,7 @@
     </para>
 
     <para>
-      In order to host MySQL, the NetWare server must meet these
-      requirements:
+      To host MySQL, the NetWare server must meet these requirements:
     </para>
 
     <itemizedlist>

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/introduction.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1215,8 +1215,8 @@
       <para>
         The MySQL server can operate in different SQL modes, and can
         apply these modes differentially for different clients. This
-        capability allows applications to tailor server operation to
-        their own requirements.
+        capability enables each application to tailor the server's
+        operating mode to its own requirements.
       </para>
 
       <para>

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/replication.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -3853,7 +3853,7 @@
     </para>
 
     <para>
-      In order to determine how many slaves you can get before the added
+      To determine how many slaves you can get before the added
       benefits begin to level out, and how much you can improve
       performance of your site, you need to know your query patterns,
       and to determine empirically by benchmarking the relationship

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -10682,7 +10682,7 @@
         </para>
 
         <para>
-          In order to accommodate granting rights to users from
+          To accommodate granting rights to users from
           arbitrary hosts, MySQL supports specifying the
           <replaceable>user</replaceable> value in the form
           <literal><replaceable>user_name</replaceable>@<replaceable>host_name</replaceable></literal>.

Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/connector-mxj.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -240,7 +240,7 @@
 
       <listitem>
         <para>
-          In order to run the JUnit test suite, the $CLASSPATH must
+          To run the JUnit test suite, the $CLASSPATH must
           include the following:
         </para>
 

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1422,7 +1422,7 @@
       <title>&title-myodbc-unix-thread-safe;</title>
 
       <para>
-        In order to link the driver with MySQL thread safe client
+        To link the driver with MySQL thread safe client
         libraries <filename>libmysqlclient_r.so</filename> or
         <filename>libmysqlclient_r.a</filename>, you must specify the
         following <command>configure</command> option:

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/database-administration.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -8029,8 +8029,8 @@
         <para>
           The MySQL server can operate in different SQL modes, and can
           apply these modes differently for different clients. This
-          enables each application to tailor the server's operating mode
-          to its own requirements.
+          capability enables each application to tailor the server's
+          operating mode to its own requirements.
         </para>
 
         <para>
@@ -8044,31 +8044,39 @@
           You can set the default SQL mode by starting
           <command>mysqld</command> with the
           <option>--sql-mode="<replaceable>modes</replaceable>"</option>
-          option. The value also can be empty
-          (<option>--sql-mode=""</option>) if you want to reset it.
+          option. <replaceable>modes</replaceable> is a list of
+          different modes separated by comma
+          (&lsquo;<literal>,</literal>&rsquo;) characters. The default
+          value is empty (no modes set). The
+          <replaceable>modes</replaceable> value also can be empty
+          (<option>--sql-mode=""</option>) if you want to clear it
+          explicitly.
         </para>
 
         <para>
-          You can also change the SQL mode after startup time by setting
-          the <literal>sql_mode</literal> variable using a <literal>SET
-          [SESSION|GLOBAL]
+          You can change the SQL mode at runtime by using a <literal>SET
+          [GLOBAL|SESSION]
           sql_mode='<replaceable>modes</replaceable>'</literal>
-          statement. Setting the <literal>GLOBAL</literal> variable
-          requires the <literal>SUPER</literal> privilege and affects
-          the operation of all clients that connect from that time on.
-          Setting the <literal>SESSION</literal> variable affects only
-          the current client. Any client can change its own session
+          statement to set the <literal>sql_mode</literal> system value.
+          Setting the <literal>GLOBAL</literal> variable requires the
+          <literal>SUPER</literal> privilege and affects the operation
+          of all clients that connect from that time on. Setting the
+          <literal>SESSION</literal> variable affects only the current
+          client. Any client can change its own session
           <literal>sql_mode</literal> value at any time.
         </para>
 
         <para>
-          <replaceable>modes</replaceable> is a list of different modes
-          separated by comma (&lsquo;<literal>,</literal>&rsquo;)
-          characters. You can retrieve the current mode by issuing a
-          <literal>SELECT @@sql_mode</literal> statement. The default
-          value is empty (no modes set).
+          You can retrieve the current global or session
+          <literal>sql_mode</literal> value with the following
+          statements:
         </para>
 
+<programlisting>
+SELECT @@global.sql_mode;
+SELECT @@session.sql_mode;
+</programlisting>
+
         <para>
           The most important <literal>sql_mode</literal> values are
           probably these:

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/functions.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1053,7 +1053,7 @@
           </para>
 
           <para>
-            In order to comply with the SQL standard,
+            To comply with the SQL standard,
             <literal>IN</literal> returns <literal>NULL</literal> not
             only if the expression on the left hand side is
             <literal>NULL</literal>, but also if no match is found in

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/installing.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -6462,8 +6462,7 @@
     </para>
 
     <para>
-      In order to host MySQL, the NetWare server must meet these
-      requirements:
+      To host MySQL, the NetWare server must meet these requirements:
     </para>
 
     <itemizedlist>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/introduction.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -820,8 +820,8 @@
       <para>
         The MySQL server can operate in different SQL modes, and can
         apply these modes differentially for different clients. This
-        capability allows applications to tailor server operation to
-        their own requirements.
+        capability enables each application to tailor the server's
+        operating mode to its own requirements.
       </para>
 
       <para>

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/replication.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -3746,7 +3746,7 @@
     </para>
 
     <para>
-      In order to determine how many slaves you can get before the added
+      To determine how many slaves you can get before the added
       benefits begin to level out, and how much you can improve
       performance of your site, you need to know your query patterns,
       and to determine empirically by benchmarking the relationship

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -11834,7 +11834,7 @@
         </para>
 
         <para>
-          In order to accommodate granting rights to users from
+          To accommodate granting rights to users from
           arbitrary hosts, MySQL supports specifying the
           <replaceable>user</replaceable> value in the form
           <literal><replaceable>user_name</replaceable>@<replaceable>host_name</replaceable></literal>.

Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/connector-mxj.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -240,7 +240,7 @@
 
       <listitem>
         <para>
-          In order to run the JUnit test suite, the $CLASSPATH must
+          To run the JUnit test suite, the $CLASSPATH must
           include the following:
         </para>
 

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1422,7 +1422,7 @@
       <title>&title-myodbc-unix-thread-safe;</title>
 
       <para>
-        In order to link the driver with MySQL thread safe client
+        To link the driver with MySQL thread safe client
         libraries <filename>libmysqlclient_r.so</filename> or
         <filename>libmysqlclient_r.a</filename>, you must specify the
         following <command>configure</command> option:

Modified: trunk/refman-5.1/custom-engine-build.xml
===================================================================
--- trunk/refman-5.1/custom-engine-build.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/custom-engine-build.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -289,7 +289,7 @@
           </para>
 
           <para>
-            In order to run a subset of tests or a specific test case,
+            To run a subset of tests or a specific test case,
             execute <command>perl ./mysql-test-run.pl
             --do-test=abc</command>.This will execute all tests that
             start with <literal>abc</literal>
@@ -335,4 +335,4 @@
 
       </section>
 
-    </section>
\ No newline at end of file
+    </section>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/database-administration.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -8091,8 +8091,8 @@
         <para>
           The MySQL server can operate in different SQL modes, and can
           apply these modes differently for different clients. This
-          enables each application to tailor the server's operating mode
-          to its own requirements.
+          capability enables each application to tailor the server's
+          operating mode to its own requirements.
         </para>
 
         <para>
@@ -8106,31 +8106,39 @@
           You can set the default SQL mode by starting
           <command>mysqld</command> with the
           <option>--sql-mode="<replaceable>modes</replaceable>"</option>
-          option. The value also can be empty
-          (<option>--sql-mode=""</option>) if you want to reset it.
+          option. <replaceable>modes</replaceable> is a list of
+          different modes separated by comma
+          (&lsquo;<literal>,</literal>&rsquo;) characters. The default
+          value is empty (no modes set). The
+          <replaceable>modes</replaceable> value also can be empty
+          (<option>--sql-mode=""</option>) if you want to clear it
+          explicitly.
         </para>
 
         <para>
-          You can also change the SQL mode after startup time by setting
-          the <literal>sql_mode</literal> variable using a <literal>SET
-          [SESSION|GLOBAL]
+          You can change the SQL mode at runtime by using a <literal>SET
+          [GLOBAL|SESSION]
           sql_mode='<replaceable>modes</replaceable>'</literal>
-          statement. Setting the <literal>GLOBAL</literal> variable
-          requires the <literal>SUPER</literal> privilege and affects
-          the operation of all clients that connect from that time on.
-          Setting the <literal>SESSION</literal> variable affects only
-          the current client. Any client can change its own session
+          statement to set the <literal>sql_mode</literal> system value.
+          Setting the <literal>GLOBAL</literal> variable requires the
+          <literal>SUPER</literal> privilege and affects the operation
+          of all clients that connect from that time on. Setting the
+          <literal>SESSION</literal> variable affects only the current
+          client. Any client can change its own session
           <literal>sql_mode</literal> value at any time.
         </para>
 
         <para>
-          <replaceable>modes</replaceable> is a list of different modes
-          separated by comma (&lsquo;<literal>,</literal>&rsquo;)
-          characters. You can retrieve the current mode by issuing a
-          <literal>SELECT @@sql_mode</literal> statement. The default
-          value is empty (no modes set).
+          You can retrieve the current global or session
+          <literal>sql_mode</literal> value with the following
+          statements:
         </para>
 
+<programlisting>
+SELECT @@global.sql_mode;
+SELECT @@session.sql_mode;
+</programlisting>
+
         <para>
           The most important <literal>sql_mode</literal> values are
           probably these:

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/functions.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -1044,7 +1044,7 @@
           </para>
 
           <para>
-            In order to comply with the SQL standard,
+            To comply with the SQL standard,
             <literal>IN</literal> returns <literal>NULL</literal> not
             only if the expression on the left hand side is
             <literal>NULL</literal>, but also if no match is found in

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/installing.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -6455,8 +6455,7 @@
     </para>
 
     <para>
-      In order to host MySQL, the NetWare server must meet these
-      requirements:
+      To host MySQL, the NetWare server must meet these requirements:
     </para>
 
     <itemizedlist>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/introduction.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -579,8 +579,8 @@
       <para>
         The MySQL server can operate in different SQL modes, and can
         apply these modes differentially for different clients. This
-        capability allows applications to tailor server operation to
-        their own requirements.
+        capability enables each application to tailor the server's
+        operating mode to its own requirements.
       </para>
 
       <para>

Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/partitioning.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -2416,7 +2416,7 @@
         <literal>12</literal> have already been assigned to partition
         <literal>p1</literal>, you cannot create a new partition on
         table <literal>tt</literal> that includes <literal>12</literal>
-        in its value list. In order to accomplish this, you could drop
+        in its value list. To accomplish this, you could drop
         <literal>p1</literal>, and add <literal>np</literal> and then a
         new <literal>p1</literal> with a modified definition. However,
         as discussed earlier, this would result in the loss of all data

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/replication.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -3903,7 +3903,7 @@
     </para>
 
     <para>
-      In order to determine how many slaves you can get before the added
+      To determine how many slaves you can get before the added
       benefits begin to level out, and how much you can improve
       performance of your site, you need to know your query patterns,
       and to determine empirically by benchmarking the relationship

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-24 03:56:38 UTC (rev 1011)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-24 04:50:25 UTC (rev 1012)
@@ -12324,7 +12324,7 @@
         </para>
 
         <para>
-          In order to accommodate granting rights to users from
+          To accommodate granting rights to users from
           arbitrary hosts, MySQL supports specifying the
           <replaceable>user</replaceable> value in the form
           <literal><replaceable>user_name</replaceable>@<replaceable>host_name</replaceable></literal>.

Thread
svn commit - mysqldoc@docsrva: r1012 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul24 Jan