svn commit - mysqldoc@docsrva: r8896 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2007-11-26 21:41:25 +0100 (Mon, 26 Nov 2007)
New Revision: 8896

Log:
 r33336@polar:  paul | 2007-11-26 14:41:04 -0600
 Update all manual versions with current list of locations where programs
 look for option files.


Modified:
   trunk/refman-4.1/using-mysql-programs.xml
   trunk/refman-5.0/using-mysql-programs.xml
   trunk/refman-5.1/using-mysql-programs.xml
   trunk/refman-6.0/using-mysql-programs.xml

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


Modified: trunk/refman-4.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-4.1/using-mysql-programs.xml	2007-11-26 20:01:41 UTC (rev 8895)
+++ trunk/refman-4.1/using-mysql-programs.xml	2007-11-26 20:41:25 UTC (rev 8896)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 6; 2603 bytes

@@ -781,15 +781,17 @@
               <entry><emphasis
role="bold">Purpose</emphasis></entry>
             </row>
             <row>
-             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>WINDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-              <entry><filename>C:\my.cnf</filename></entry>
+              <entry><filename>C:\my.ini</filename>,
<filename>C:\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>INSTALLDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global Options</entry>
             </row>
             <row>

@@ -802,6 +804,19 @@
         </tgroup>
       </informaltable>
 
+      <note>
+        <para>
+          Programs look for option files using both extensions
+          (<filename>.ini</filename>, <filename>.cnf</filename>)
in all
+          locations only as of MySQL 4.0.23 and 4.1.8. Before MySQL
+          4.0.23 and 4.1.8, programs look in
+          <replaceable>WINDIR</replaceable> and
+          <replaceable>INSTALLDIR</replaceable> only for
+          <filename>my.ini</filename>, and in
<filename>C:\</filename>
+          only for <filename>my.cnf</filename>.
+        </para>
+      </note>
+
       <para>
         <replaceable>WINDIR</replaceable> represents the location of
         your Windows directory. This is commonly

@@ -816,9 +831,9 @@
 </programlisting>
 
       <para>
-        <replaceable>INSTALLDIR</replaceable> represents the
-        installation directory of MySQL. With MySQL 4.1.5 and up, this
-        is typically
+        <replaceable>INSTALLDIR</replaceable> represents the MySQL
+        installation directory. With MySQL 4.1.5 and up, this is
+        typically
         <filename>C:\<replaceable>PROGRAMDIR</replaceable>\MySQL\MySQL
         &current-series; Server</filename> where
         <replaceable>PROGRAMDIR</replaceable> represents the programs


Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml	2007-11-26 20:01:41 UTC (rev 8895)
+++ trunk/refman-5.0/using-mysql-programs.xml	2007-11-26 20:41:25 UTC (rev 8896)
Changed blocks: 5, Lines Added: 20, Lines Deleted: 6; 3119 bytes

@@ -772,15 +772,17 @@
               <entry><emphasis
role="bold">Purpose</emphasis></entry>
             </row>
             <row>
-             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>WINDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-              <entry><filename>C:\my.cnf</filename></entry>
+              <entry><filename>C:\my.ini</filename>,
<filename>C:\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>INSTALLDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global Options</entry>
             </row>
             <row>

@@ -806,8 +808,8 @@
 </programlisting>
 
       <para>
-        <replaceable>INSTALLDIR</replaceable> represents the
-        installation directory of MySQL. This is typically
+        <replaceable>INSTALLDIR</replaceable> represents the MySQL
+        installation directory. This is typically
         <filename>C:\<replaceable>PROGRAMDIR</replaceable>\MySQL\MySQL
         &current-series; Server</filename> where
         <replaceable>PROGRAMDIR</replaceable> represents the programs

@@ -854,6 +856,10 @@
               <entry><filename>~/.my.cnf</filename></entry>
               <entry>User-specific options</entry>
             </row>
+            <row>
+             
<entry><filename><replaceable>SYSCONFDIR</replaceable>/my.cnf</filename></entry>
+              <entry>Global Options</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>

@@ -912,7 +918,6 @@
         In MySQL &current-series;, use of
         <replaceable>DATADIR</replaceable> as the location for
         <filename>my.cnf</filename> is deprecated.
-        <replaceable>BASEDIR</replaceable> is a better location.
       </para>
 
       <para>

@@ -929,6 +934,15 @@
       </para>
 
       <para>
+        <replaceable>SYSCONFDIR</replaceable> represents the directory
+        specified with the <literal>--sysconfdir</literal> option to
+        <command>configure</command> when MySQL was built. By default,
+        this is the <filename>etc</filename> directory located under the
+        compiled-in installation directory. This location is used as of
+        MySQL 5.0.21.
+      </para>
+
+      <para>
         MySQL looks for option files in the order just described and
         reads any that exist. If an option file that you want to use
         does not exist, create it with a plain text editor.


Modified: trunk/refman-5.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.1/using-mysql-programs.xml	2007-11-26 20:01:41 UTC (rev 8895)
+++ trunk/refman-5.1/using-mysql-programs.xml	2007-11-26 20:41:25 UTC (rev 8896)
Changed blocks: 5, Lines Added: 20, Lines Deleted: 6; 3119 bytes

@@ -772,15 +772,17 @@
               <entry><emphasis
role="bold">Purpose</emphasis></entry>
             </row>
             <row>
-             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>WINDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-              <entry><filename>C:\my.cnf</filename></entry>
+              <entry><filename>C:\my.ini</filename>,
<filename>C:\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>INSTALLDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global Options</entry>
             </row>
             <row>

@@ -806,8 +808,8 @@
 </programlisting>
 
       <para>
-        <replaceable>INSTALLDIR</replaceable> represents the
-        installation directory of MySQL. This is typically
+        <replaceable>INSTALLDIR</replaceable> represents the MySQL
+        installation directory. This is typically
         <filename>C:\<replaceable>PROGRAMDIR</replaceable>\MySQL\MySQL
         &current-series; Server</filename> where
         <replaceable>PROGRAMDIR</replaceable> represents the programs

@@ -858,6 +860,10 @@
               <entry><filename>~/.my.cnf</filename></entry>
               <entry>User-specific options</entry>
             </row>
+            <row>
+             
<entry><filename><replaceable>SYSCONFDIR</replaceable>/my.cnf</filename></entry>
+              <entry>Global Options</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>

@@ -914,7 +920,6 @@
         In MySQL &current-series;, use of
         <replaceable>DATADIR</replaceable> as the location for
         <filename>my.cnf</filename> is deprecated.
-        <replaceable>BASEDIR</replaceable> is a better location.
       </para>
 
       <para>

@@ -931,6 +936,15 @@
       </para>
 
       <para>
+        <replaceable>SYSCONFDIR</replaceable> represents the directory
+        specified with the <literal>--sysconfdir</literal> option to
+        <command>configure</command> when MySQL was built. By default,
+        this is the <filename>etc</filename> directory located under the
+        compiled-in installation directory. This location is used as of
+        MySQL 5.1.10.
+      </para>
+
+      <para>
         MySQL looks for option files in the order just described and
         reads any that exist. If an option file that you want to use
         does not exist, create it with a plain text editor.


Modified: trunk/refman-6.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-6.0/using-mysql-programs.xml	2007-11-26 20:01:41 UTC (rev 8895)
+++ trunk/refman-6.0/using-mysql-programs.xml	2007-11-26 20:41:25 UTC (rev 8896)
Changed blocks: 5, Lines Added: 19, Lines Deleted: 6; 3069 bytes

@@ -772,15 +772,17 @@
               <entry><emphasis
role="bold">Purpose</emphasis></entry>
             </row>
             <row>
-             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>WINDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>WINDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-              <entry><filename>C:\my.cnf</filename></entry>
+              <entry><filename>C:\my.ini</filename>,
<filename>C:\my.cnf</filename></entry>
               <entry>Global options</entry>
             </row>
             <row>
-             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename></entry>
+             
<entry><filename><replaceable>INSTALLDIR</replaceable>\my.ini</filename>,
+               
<filename><replaceable>INSTALLDIR</replaceable>\my.cnf</filename></entry>
               <entry>Global Options</entry>
             </row>
             <row>

@@ -806,8 +808,8 @@
 </programlisting>
 
       <para>
-        <replaceable>INSTALLDIR</replaceable> represents the
-        installation directory of MySQL. This is typically
+        <replaceable>INSTALLDIR</replaceable> represents the MySQL
+        installation directory. This is typically
         <filename>C:\<replaceable>PROGRAMDIR</replaceable>\MySQL\MySQL
         &current-series; Server</filename> where
         <replaceable>PROGRAMDIR</replaceable> represents the programs

@@ -858,6 +860,10 @@
               <entry><filename>~/.my.cnf</filename></entry>
               <entry>User-specific options</entry>
             </row>
+            <row>
+             
<entry><filename><replaceable>SYSCONFDIR</replaceable>/my.cnf</filename></entry>
+              <entry>Global Options</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>

@@ -914,7 +920,6 @@
         In MySQL &current-series;, use of
         <replaceable>DATADIR</replaceable> as the location for
         <filename>my.cnf</filename> is deprecated.
-        <replaceable>BASEDIR</replaceable> is a better location.
       </para>
 
       <para>

@@ -931,6 +936,14 @@
       </para>
 
       <para>
+        <replaceable>SYSCONFDIR</replaceable> represents the directory
+        specified with the <literal>--sysconfdir</literal> option to
+        <command>configure</command> when MySQL was built. By default,
+        this is the <filename>etc</filename> directory located under the
+        compiled-in installation directory.
+      </para>
+
+      <para>
         MySQL looks for option files in the order just described and
         reads any that exist. If an option file that you want to use
         does not exist, create it with a plain text editor.