List:Commits« Previous MessageNext Message »
From:paul Date:January 24 2006 4:49pm
Subject:svn commit - mysqldoc@docsrva: r1021 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-24 17:49:57 +0100 (Tue, 24 Jan 2006)
New Revision: 1021

Log:
 r6640@frost:  paul | 2006-01-24 10:49:44 -0600
 Update references to deprecated server options:
 --default-character-set -> --character-set-server
 --default-collation -> --collation-server


Modified:
   trunk/
   trunk/refman-4.1/charset.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/replication.xml


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

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-4.1/charset.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -420,15 +420,15 @@
       <para>
         Initially, the server character set and collation depend on the
         options that you use when you start <command>mysqld</command>.
-        You can use <option>--default-character-set</option> for the
-        character set. Along with it you can add
-        <option>--default-collation</option> for the collation. If you
+        You can use <option>--character-set-server</option> for the
+        character set. Along with it, you can add
+        <option>--collation-server</option> for the collation. If you
         don't specify a character set, that is the same as saying
-        <option>--default-character-set=latin1</option>. If you specify
+        <option>--character-set-server=latin1</option>. If you specify
         only a character set (for example, <literal>latin1</literal>)
         but not a collation, that is the same as saying
-        <option>--default-charset=latin1</option>
-        <option>--default-collation=latin1_swedish_ci</option> because
+        <option>--character-set-server=latin1</option>
+        <option>--collation-server=latin1_swedish_ci</option> because
         <literal>latin1_swedish_ci</literal> is the default collation
         for <literal>latin1</literal>. Therefore, the following three
         commands all have the same effect:
@@ -436,9 +436,9 @@
 
 <programlisting>
 shell&gt; <userinput>mysqld</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1 \</userinput>
-           <userinput>--default-collation=latin1_swedish_ci</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1 \</userinput>
+           <userinput>--collation-server=latin1_swedish_ci</userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-4.1/database-administration.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -18984,8 +18984,10 @@
 
       <para>
         You can change the character set with the
-        <option>--default-character-set</option> option when you start
-        the server. The character sets available depend on the
+        <option>--character-set-server</option> option when you start
+        the server
+        (<option>--default-character-set</option> before MySQL 4.1.3).
+        The character sets available depend on the
         <option>--with-charset=<replaceable>charset</replaceable></option>
         and <option>--with-extra-charsets=
         <replaceable>list-of-charsets</replaceable> | complex | all |
@@ -18996,8 +18998,8 @@
       </para>
 
       <para>
-        As of MySQL 4.1.1, you can also change the character set
-        collation with the <option>--default-collation</option> option
+        As of MySQL 4.1.3, you can also change the character set
+        collation with the <option>--collation-server</option> option
         when you start the server. The collation must be a legal
         collation for the default character set. (Use the <literal>SHOW
         COLLATION</literal> statement to determine which collations are

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-4.1/replication.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -1715,8 +1715,8 @@
             <para>
               You must <emphasis role="bold">always</emphasis> use the
               same <emphasis role="bold">global</emphasis> character set
-              and collation (<option>--default-character-set</option>,
-              <option>--default-collation</option>) on the master and
+              and collation (<option>--character-set-server</option>,
+              <option>--collation-server</option>) on the master and
               the slave. Otherwise, you may get duplicate-key errors on
               the slave, because a key that is regarded as unique in the
               master's character set may not be unique in the slave's
@@ -1726,7 +1726,7 @@
 
           <listitem>
             <para>
-              If the master is older than MySQL 4.1.3, then the
+              If the master is older than MySQL 4.1.3, the
               character set of the session should never be made
               different from its global value (in other words, do not
               use <literal>SET NAMES</literal>, <literal>SET CHARACTER

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.0/charset.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -407,15 +407,15 @@
       <para>
         Initially, the server character set and collation depend on the
         options that you use when you start <command>mysqld</command>.
-        You can use <option>--default-character-set</option> for the
-        character set. Along with it you can add
-        <option>--default-collation</option> for the collation. If you
+        You can use <option>--character-set-server</option> for the
+        character set. Along with it, you can add
+        <option>--collation-server</option> for the collation. If you
         don't specify a character set, that is the same as saying
-        <option>--default-character-set=latin1</option>. If you specify
+        <option>--character-set-server=latin1</option>. If you specify
         only a character set (for example, <literal>latin1</literal>)
         but not a collation, that is the same as saying
-        <option>--default-charset=latin1</option>
-        <option>--default-collation=latin1_swedish_ci</option> because
+        <option>--character-set-server=latin1</option>
+        <option>--collation-server=latin1_swedish_ci</option> because
         <literal>latin1_swedish_ci</literal> is the default collation
         for <literal>latin1</literal>. Therefore, the following three
         commands all have the same effect:
@@ -423,9 +423,9 @@
 
 <programlisting>
 shell&gt; <userinput>mysqld</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1 \</userinput>
-           <userinput>--default-collation=latin1_swedish_ci</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1 \</userinput>
+           <userinput>--collation-server=latin1_swedish_ci</userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.0/database-administration.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -20201,12 +20201,6 @@
 mysql&gt; <userinput>TRUNCATE TABLE <replaceable>tbl_name</replaceable>;</userinput>
 mysql&gt; <userinput>quit</userinput>
 </programlisting>
-
-            <para>
-              If your version of MySQL doesn't have <literal>TRUNCATE
-              TABLE</literal>, use <literal>DELETE FROM
-              <replaceable>tbl_name</replaceable></literal> instead.
-            </para>
           </listitem>
 
           <listitem>
@@ -21226,7 +21220,7 @@
 
       <para>
         You can change the character set with the
-        <option>--default-character-set</option> option when you start
+        <option>--character-set-server</option> option when you start
         the server. The character sets available depend on the
         <option>--with-charset=<replaceable>charset</replaceable></option>
         and
@@ -21240,7 +21234,7 @@
 
       <para>
         You can also change the character set collation with the
-        <option>--default-collation</option> option when you start the
+        <option>--collation-server</option> option when you start the
         server. The collation must be a legal collation for the default
         character set. (Use the <literal>SHOW COLLATION</literal>
         statement to determine which collations are available for each

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.0/replication.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -1658,8 +1658,8 @@
             <para>
               You must <emphasis role="bold">always</emphasis> use the
               same <emphasis role="bold">global</emphasis> character set
-              and collation (<option>--default-character-set</option>,
-              <option>--default-collation</option>) on the master and
+              and collation (<option>--character-set-server</option>,
+              <option>--collation-server</option>) on the master and
               the slave. Otherwise, you may get duplicate-key errors on
               the slave, because a key that is regarded as unique in the
               master's character set may not be unique in the slave's
@@ -1669,7 +1669,7 @@
 
           <listitem>
             <para>
-              If the master is older than MySQL 4.1.3, then the
+              If the master is older than MySQL 4.1.3, the
               character set of the session should never be made
               different from its global value (in other words, do not
               use <literal>SET NAMES</literal>, <literal>SET CHARACTER

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.1/charset.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -407,15 +407,15 @@
       <para>
         Initially, the server character set and collation depend on the
         options that you use when you start <command>mysqld</command>.
-        You can use <option>--default-character-set</option> for the
-        character set. Along with it you can add
-        <option>--default-collation</option> for the collation. If you
+        You can use <option>--character-set-server</option> for the
+        character set. Along with it, you can add
+        <option>--collation-server</option> for the collation. If you
         don't specify a character set, that is the same as saying
-        <option>--default-character-set=latin1</option>. If you specify
+        <option>--character-set-server=latin1</option>. If you specify
         only a character set (for example, <literal>latin1</literal>)
         but not a collation, that is the same as saying
-        <option>--default-charset=latin1</option>
-        <option>--default-collation=latin1_swedish_ci</option> because
+        <option>--character-set-server=latin1</option>
+        <option>--collation-server=latin1_swedish_ci</option> because
         <literal>latin1_swedish_ci</literal> is the default collation
         for <literal>latin1</literal>. Therefore, the following three
         commands all have the same effect:
@@ -423,9 +423,9 @@
 
 <programlisting>
 shell&gt; <userinput>mysqld</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1</userinput>
-shell&gt; <userinput>mysqld --default-character-set=latin1 \</userinput>
-           <userinput>--default-collation=latin1_swedish_ci</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1</userinput>
+shell&gt; <userinput>mysqld --character-set-server=latin1 \</userinput>
+           <userinput>--collation-server=latin1_swedish_ci</userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.1/database-administration.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -20214,12 +20214,6 @@
 mysql&gt; <userinput>TRUNCATE TABLE <replaceable>tbl_name</replaceable>;</userinput>
 mysql&gt; <userinput>quit</userinput>
 </programlisting>
-
-            <para>
-              If your version of MySQL doesn't have <literal>TRUNCATE
-              TABLE</literal>, use <literal>DELETE FROM
-              <replaceable>tbl_name</replaceable></literal> instead.
-            </para>
           </listitem>
 
           <listitem>
@@ -21239,7 +21233,7 @@
 
       <para>
         You can change the character set with the
-        <option>--default-character-set</option> option when you start
+        <option>--character-set-server</option> option when you start
         the server. The character sets available depend on the
         <option>--with-charset=<replaceable>charset</replaceable></option>
         and
@@ -21253,7 +21247,7 @@
 
       <para>
         You can also change the character set collation with the
-        <option>--default-collation</option> option when you start the
+        <option>--collation-server</option> option when you start the
         server. The collation must be a legal collation for the default
         character set. (Use the <literal>SHOW COLLATION</literal>
         statement to determine which collations are available for each

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-24 16:25:43 UTC (rev 1020)
+++ trunk/refman-5.1/replication.xml	2006-01-24 16:49:57 UTC (rev 1021)
@@ -1840,8 +1840,8 @@
             <para>
               You must <emphasis role="bold">always</emphasis> use the
               same <emphasis role="bold">global</emphasis> character set
-              and collation (<option>--default-character-set</option>,
-              <option>--default-collation</option>) on the master and
+              and collation (<option>--character-set-server</option>,
+              <option>--collation-server</option>) on the master and
               the slave. Otherwise, you may get duplicate-key errors on
               the slave, because a key that is regarded as unique in the
               master's character set may not be unique in the slave's
@@ -1851,7 +1851,7 @@
 
           <listitem>
             <para>
-              If the master is older than MySQL 4.1.3, then the
+              If the master is older than MySQL 4.1.3, the
               character set of the session should never be made
               different from its global value (in other words, do not
               use <literal>SET NAMES</literal>, <literal>SET CHARACTER

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