List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 19 2010 8:13pm
Subject:svn commit - mysqldoc@docsrva: r22341 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2010-08-19 22:13:35 +0200 (Thu, 19 Aug 2010)
New Revision: 22341

Log:
 r62481@frost:  paul | 2010-08-19 15:13:18 -0500
 Revisions to backup chapter overview


Modified:
   trunk/refman-4.1/backup.xml
   trunk/refman-5.0/backup.xml
   trunk/refman-5.1/backup.xml
   trunk/refman-5.5/backup.xml
   trunk/refman-5.6/backup.xml
   trunk/refman-6.0/backup.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:41634
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:62479
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
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41634
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:62481
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


Modified: trunk/refman-4.1/backup.xml
===================================================================
--- trunk/refman-4.1/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-4.1/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 104; 7466 bytes

@@ -567,6 +567,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -587,11 +601,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -607,58 +622,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -694,6 +666,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -713,13 +692,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -741,55 +713,9 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
-    </para>
+       <command>myisamchk</command> fails, see
+       <xref linkend="myisam-table-maintenance"/>.
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-
-        <para>
-          If you are using the update logs instead, you can process
-          their contents like this:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>ls -1 -t -r hostname.[0-9]* | xargs cat | mysql</userinput>
-</programlisting>
-
-        <para>
-          <command>ls</command> is used to sort the update log file
-          names into the right order.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -958,7 +884,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Modified: trunk/refman-5.0/backup.xml
===================================================================
--- trunk/refman-5.0/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-5.0/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 89; 7074 bytes

@@ -567,6 +567,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -587,11 +601,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -607,58 +622,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -694,6 +666,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -713,13 +692,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -741,41 +713,10 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
+      <command>myisamchk</command> fails, see
+      <xref linkend="myisam-table-maintenance"/>.
     </para>
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -938,7 +879,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Modified: trunk/refman-5.1/backup.xml
===================================================================
--- trunk/refman-5.1/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-5.1/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 89; 7074 bytes

@@ -576,6 +576,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -596,11 +610,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -616,58 +631,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -703,6 +675,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -722,13 +701,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -750,41 +722,10 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
+      <command>myisamchk</command> fails, see
+      <xref linkend="myisam-table-maintenance"/>.
     </para>
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -947,7 +888,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Modified: trunk/refman-5.5/backup.xml
===================================================================
--- trunk/refman-5.5/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-5.5/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 89; 7074 bytes

@@ -584,6 +584,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -604,11 +618,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -624,58 +639,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -711,6 +683,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -730,13 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -758,41 +730,10 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
+      <command>myisamchk</command> fails, see
+      <xref linkend="myisam-table-maintenance"/>.
     </para>
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -955,7 +896,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Modified: trunk/refman-5.6/backup.xml
===================================================================
--- trunk/refman-5.6/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-5.6/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 89; 7074 bytes

@@ -584,6 +584,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -604,11 +618,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -624,58 +639,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -711,6 +683,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -730,13 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -758,41 +730,10 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
+      <command>myisamchk</command> fails, see
+      <xref linkend="myisam-table-maintenance"/>.
     </para>
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -955,7 +896,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Modified: trunk/refman-6.0/backup.xml
===================================================================
--- trunk/refman-6.0/backup.xml	2010-08-19 19:48:16 UTC (rev 22340)
+++ trunk/refman-6.0/backup.xml	2010-08-19 20:13:35 UTC (rev 22341)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 89; 7074 bytes

@@ -584,6 +584,20 @@
     </para>
 
     <para>
+      You can also create a binary backup simply by copying all table
+      files, as long as the server isn't updating anything. The
+      <command>mysqlhotcopy</command> script uses this method. (But note
+      that table file copying methods do not work if your database
+      contains <literal>InnoDB</literal> tables.
+      <command>mysqlhotcopy</command> does not work for
+      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
+      does not necessarily store table contents in database directories.
+      Also, even if the server is not actively updating data,
+      <literal>InnoDB</literal> may still have modified data cached in
+      memory and not flushed to disk.
+    </para>
+
+    <para>
       <emphasis role="bold">Making Delimited-Text File
       Backups</emphasis>
     </para>

@@ -604,11 +618,12 @@
       Another way to create text data files (along with files containing
       <literal role="stmt">CREATE TABLE</literal> statements for the
       backed up tables) is to use <command>mysqldump</command> with the
-      <option role="mysqldump">--tab</option> option.
+      <option role="mysqldump">--tab</option> option. See
+      <xref linkend="mysqldump-delimited-text"/>.
     </para>
 
     <para>
-      To reload the output data file, use
+      To reload a delimited-text data file, use
       <literal role="stmt" condition="load-data">LOAD DATA
       INFILE</literal> or <command>mysqlimport</command>.
     </para>

@@ -624,58 +639,15 @@
       <command>mysqlhotcopy</command> script can make backups.
       <command>mysqldump</command> is more general because it can back
       up all kinds of tables. <command>mysqlhotcopy</command> works only
-      with some storage engines. (See <xref linkend="mysqldump"/>, and
-      <xref linkend="mysqlhotcopy"/>.)
+      with some storage engines. (See <xref linkend="using-mysqldump"/>,
+      and <xref linkend="mysqlhotcopy"/>.)
     </para>
 
     <para>
-      Create a full backup of your database using
-      <command>mysqldump</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqldump <replaceable>db_name</replaceable> &gt; <replaceable>dump_file</replaceable></userinput>
-shell&gt; <userinput>mysqldump --tab=<replaceable>/path/to/some/dir</replaceable> <replaceable>db_name</replaceable></userinput>
-</programlisting>
-
-    <para>
-      The first command dumps the database to the named file as
-      <literal role="stmt">CREATE TABLE</literal> and
-      <literal role="stmt">INSERT</literal> statements. The second
-      command creates two files per table in the named output directory.
-      One file contains the table contents as tab-delimited text. Other
-      other contains a <literal role="stmt">CREATE TABLE</literal>
-      statement for the table.
-    </para>
-
-    <para>
-      Create a full backup of your database using
-      <command>mysqlhotcopy</command>:
-    </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlhotcopy <replaceable>db_name</replaceable> <replaceable>/path/to/some/dir</replaceable></userinput>
-</programlisting>
-
-    <para>
-      You can also create a binary backup simply by copying all table
-      files, as long as the server isn't updating anything. The
-      <command>mysqlhotcopy</command> script uses this method. (But note
-      that table file copying methods do not work if your database
-      contains <literal>InnoDB</literal> tables.
-      <command>mysqlhotcopy</command> does not work for
-      <literal>InnoDB</literal> tables because <literal>InnoDB</literal>
-      does not necessarily store table contents in database directories.
-      Also, even if the server is not actively updating data,
-      <literal>InnoDB</literal> may still have modified data cached in
-      memory and not flushed to disk.
-    </para>
-
-    <para>
       For <literal>InnoDB</literal> tables, it is possible to perform an
       online backup that takes no locks on tables using the
       <option role="mysqldump">--single-transaction</option> option to
-      <command>mysqldump</command>. See <xref linkend="mysqldump"/>.
+      <command>mysqldump</command>. See <xref linkend="backup-policy"/>.
     </para>
 
     <para>

@@ -711,6 +683,13 @@
     </para>
 
     <para>
+      If you have performance problems with your master server while
+      making backups, one strategy that can help is to set up
+      replication and perform backups on the slave rather than on the
+      master. See <xref linkend="replication-solutions-backups"/>.
+    </para>
+
+    <para>
       If you are backing up a slave replication server, you should back
       up its <filename>master.info</filename> and
       <filename>relay-log.info</filename> files when you back up the

@@ -730,13 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <para>
-      If you have performance problems with your master server while
-      making backups, one strategy that can help is to set up
-      replication and perform backups on the slave rather than on the
-      master. See <xref linkend="replication-solutions-backups"/>.
-    </para>
-
     <formalpara role="mnmas">
 
       <title>MySQL Enterprise</title>

@@ -758,41 +730,10 @@
       become corrupt, try to recover them using
       <literal role="stmt">REPAIR TABLE</literal> or <command>myisamchk
       -r</command> first. That should work in 99.9% of all cases. If
-      <command>myisamchk</command> fails, try the following procedure.
-      It is assumed that you have enabled binary logging by starting
-      MySQL with the <option role="mysqld">--log-bin</option> option.
+      <command>myisamchk</command> fails, see
+      <xref linkend="myisam-table-maintenance"/>.
     </para>
 
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Restore the table from a <command>mysqldump</command> backup
-          or binary backup.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Execute the following command to re-run the updates in the
-          binary logs:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
-</programlisting>
-
-        <para>
-          In some cases, you may want to re-run only certain binary
-          logs, from certain positions (usually you want to re-run all
-          binary logs from the date of the restored backup, excepting
-          possibly some incorrect statements). See
-          <xref linkend="point-in-time-recovery"/>.
-        </para>
-      </listitem>
-
-    </orderedlist>
-
     <para>
       <emphasis role="bold">Making Backups Using a File System
       Snapshot</emphasis>

@@ -955,7 +896,7 @@
 
     <section id="backup-policy">
 
-      <title>Backup Policy</title>
+      <title>Establishing a Backup Policy</title>
 
       <para>
         To be useful, backups must be scheduled regularly. A full backup


Thread
svn commit - mysqldoc@docsrva: r22341 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois19 Aug