List:Commits« Previous MessageNext Message »
From:paul.dubois Date:February 9 2011 4:22pm
Subject:svn commit - mysqldoc@docsrva: r25026 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6
View as plain text  
Author: paul
Date: 2011-02-09 17:22:35 +0100 (Wed, 09 Feb 2011)
New Revision: 25026

Log:
 r44858@dhcp-213:  paul | 2011-02-09 10:21:05 -0500
 Information about the "template" data directory that the MSI installer
 creates in addition to the data directory the server actually uses.


Modified:
   trunk/dynamic-docs/changelog/mysqld-2.xml
   trunk/refman-5.5/dba-multiple-servers.xml
   trunk/refman-5.5/installing-windows.xml
   trunk/refman-5.6/dba-multiple-servers.xml
   trunk/refman-5.6/installing-windows.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46807
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44857
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46807
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44858


Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml	2011-02-09 16:22:27 UTC (rev 25025)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml	2011-02-09 16:22:35 UTC (rev 25026)
Changed blocks: 1, Lines Added: 26, Lines Deleted: 0; 1033 bytes

@@ -39520,4 +39520,30 @@
 
   </logentry>
 
+  <logentry entrytype="feature">
+
+    <tags>
+      <manual type="Windows"/>
+    </tags>
+
+    <versions>
+      <version ver="5.5.5"/>
+    </versions>
+
+    <message>
+
+      <para>
+        The Windows MSI package creates and sets up the data directory
+        that the installed server will use, but now it also creates a
+        pristine <quote>template</quote> data directory named
+        <filename>data</filename> under the installation directory.
+        After an installation has been performed using this package, the
+        template data directory can be copied to set up additional MySQL
+        instances. See <xref linkend="multiple-servers"/>.
+      </para>
+
+    </message>
+
+  </logentry>
+
 </changelog>


Modified: trunk/refman-5.5/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.5/dba-multiple-servers.xml	2011-02-09 16:22:27 UTC (rev 25025)
+++ trunk/refman-5.5/dba-multiple-servers.xml	2011-02-09 16:22:35 UTC (rev 25026)
Changed blocks: 1, Lines Added: 27, Lines Deleted: 4; 1660 bytes

@@ -305,12 +305,35 @@
 
     <para>
       On Windows, the data directory is included with the MySQL
-      distribution. If you obtain a Windows Zip archive distribution,
-      you can unpack it into a temporary location, then copy the
-      <filename>data</filename> directory from this location to where
-      you are setting up the new instance.
+      distribution:
     </para>
 
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          MySQL Zip archive distributions for Windows contain an
+          unmodified data directory. You can unpack such a distribution
+          into a temporary location, then copy it
+          <filename>data</filename> directory to where you are setting
+          up the new instance.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          As of MySQL 5.5.5, the Windows MSI package creates and sets up
+          the data directory that the installed server will use, but it
+          also creates a pristine <quote>template</quote> data directory
+          named <filename>data</filename> under the installation
+          directory. After an installation has been performed using this
+          package, the template data directory can be copied to set up
+          additional MySQL instances.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
     <bridgehead>
       Copy an Existing Data Directory
     </bridgehead>


Modified: trunk/refman-5.5/installing-windows.xml
===================================================================
--- trunk/refman-5.5/installing-windows.xml	2011-02-09 16:22:27 UTC (rev 25025)
+++ trunk/refman-5.5/installing-windows.xml	2011-02-09 16:22:35 UTC (rev 25026)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 928 bytes

@@ -260,6 +260,17 @@
       </tgroup>
     </table>
 
+    <para>
+      If you install MySQL using the Windows MSI package, this package
+      creates and sets up the data directory that the installed server
+      will use, but as of MySQL 5.5.5, it also creates a pristine
+      <quote>template</quote> data directory named
+      <filename>data</filename> under the installation directory. After
+      an installation has been performed using this package, the
+      template data directory can be copied to set up additional MySQL
+      instances. See <xref linkend="multiple-servers"/>.
+    </para>
+
   </section>
 
   <section id="windows-choosing-package">


Modified: trunk/refman-5.6/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.6/dba-multiple-servers.xml	2011-02-09 16:22:27 UTC (rev 25025)
+++ trunk/refman-5.6/dba-multiple-servers.xml	2011-02-09 16:22:35 UTC (rev 25026)
Changed blocks: 1, Lines Added: 27, Lines Deleted: 4; 1641 bytes

@@ -305,12 +305,35 @@
 
     <para>
       On Windows, the data directory is included with the MySQL
-      distribution. If you obtain a Windows Zip archive distribution,
-      you can unpack it into a temporary location, then copy the
-      <filename>data</filename> directory from this location to where
-      you are setting up the new instance.
+      distribution:
     </para>
 
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          MySQL Zip archive distributions for Windows contain an
+          unmodified data directory. You can unpack such a distribution
+          into a temporary location, then copy it
+          <filename>data</filename> directory to where you are setting
+          up the new instance.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The Windows MSI package creates and sets up the data directory
+          that the installed server will use, but it also creates a
+          pristine <quote>template</quote> data directory named
+          <filename>data</filename> under the installation directory.
+          After an installation has been performed using this package,
+          the template data directory can be copied to set up additional
+          MySQL instances.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
     <bridgehead>
       Copy an Existing Data Directory
     </bridgehead>


Modified: trunk/refman-5.6/installing-windows.xml
===================================================================
--- trunk/refman-5.6/installing-windows.xml	2011-02-09 16:22:27 UTC (rev 25025)
+++ trunk/refman-5.6/installing-windows.xml	2011-02-09 16:22:35 UTC (rev 25026)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 909 bytes

@@ -260,6 +260,17 @@
       </tgroup>
     </table>
 
+    <para>
+      If you install MySQL using the Windows MSI package, this package
+      creates and sets up the data directory that the installed server
+      will use, but it also creates a pristine <quote>template</quote>
+      data directory named <filename>data</filename> under the
+      installation directory. After an installation has been performed
+      using this package, the template data directory can be copied to
+      set up additional MySQL instances. See
+      <xref linkend="multiple-servers"/>.
+    </para>
+
   </section>
 
   <section id="windows-choosing-package">


Thread
svn commit - mysqldoc@docsrva: r25026 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6paul.dubois9 Feb