List:Commits« Previous MessageNext Message »
From:paul Date:January 19 2006 9:18pm
Subject:svn commit - mysqldoc@docsrva: r937 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-19 22:18:11 +0100 (Thu, 19 Jan 2006)
New Revision: 937

Log:
 r6458@frost:  paul | 2006-01-19 15:17:22 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.1/client-utility-programs.xml


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-19 21:17:55 UTC (rev 936)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-19 21:18:11 UTC (rev 937)
@@ -4534,26 +4534,30 @@
           <filename>binlog.000003</filename>. Event information includes
           the statement executed, the time the statement took, the
           thread ID of the client that issued it, the timestamp when it
-          was issued, and so forth.
+          was executed, and so forth.
         </para>
 
         <para>
+          The output from <command>mysqlbinlog</command> can be
+          re-executed (for example, by using it as input to
+          <command>mysql</command>) to reapply the statements in the
+          log. This is useful for recovery operations after a server
+          crash. For other usage examples, see the discussion later in
+          this section.
+        </para>
+
+        <para>
           Normally, you use <command>mysqlbinlog</command> to read
           binary log files directly and apply them to the local MySQL
           server. It is also possible to read binary logs from a remote
           server by using the <option>--read-from-remote-server</option>
-          option.
-        </para>
-
-        <para>
-          When you read remote binary logs, the connection parameter
-          options can be given to indicate how to connect to the server,
-          but they are ignored unless you also specify the
-          <option>--read-from-remote-server</option> option. These
-          options are <option>--host</option>,
+          option. When you read remote binary logs, the connection
+          parameter options can be given to indicate how to connect to
+          the server. These options are <option>--host</option>,
           <option>--password</option>, <option>--port</option>,
           <option>--protocol</option>, <option>--socket</option>, and
-          <option>--user</option>.
+          <option>--user</option>; they are ignored except when you also
+          use the <option>--read-from-remote-server</option> option.
         </para>
 
         <para>
@@ -4563,8 +4567,9 @@
         </para>
 
         <para>
-          <xref linkend="binary-log"/>, discusses the binary log
-          further.
+          Binary logs and relay logs are discussed further in
+          <xref linkend="binary-log"/>, and
+          <xref linkend="slave-logs"/>. further.
         </para>
 
         <para>
@@ -4639,7 +4644,8 @@
             </para>
 
             <para>
-              Skip the first <replaceable>N</replaceable> entries.
+              Skip the first <replaceable>N</replaceable> entries in the
+              log.
             </para>
           </listitem>
 
@@ -4685,7 +4691,7 @@
             </para>
 
             <para>
-              Deprecated, use <option>--start-position</option> instead
+              Deprecated. Use <option>--start-position</option> instead
               (starting from MySQL 4.1.4).
             </para>
           </listitem>
@@ -4707,9 +4713,10 @@
             </para>
 
             <para>
-              Read the binary log from a MySQL server. Any connection
-              parameter options are ignored unless this option is given
-              as well. These options are <option>--host</option>,
+              Read the binary log from a MySQL server rather than
+              reading a local log file. Any connection parameter options
+              are ignored unless this option is given as well. These
+              options are <option>--host</option>,
               <option>--password</option>, <option>--port</option>,
               <option>--protocol</option>, <option>--socket</option>,
               and <option>--user</option>.
@@ -4758,7 +4765,7 @@
 
             <para>
               Start reading the binary log at the first event having a
-              datetime equal to or later than the
+              timestamp equal to or later than the
               <replaceable>datetime</replaceable> argument. The
               <replaceable>datetime</replaceable> value is relative to
               the local time zone on the machine where you run
@@ -4768,12 +4775,13 @@
             </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog --start-datetime="2004-12-25 11:25:56" binlog.000003</userinput>
+shell&gt; <userinput>mysqlbinlog --start-datetime="2005-12-25 11:25:56" binlog.000003</userinput>
 </programlisting>
 
             <para>
               This option is available as of MySQL 4.1.4. It is useful
               for point-in-time recovery.
+              <xref linkend="backup-policy"/>.
             </para>
           </listitem>
 
@@ -4784,13 +4792,12 @@
 
             <para>
               Stop reading the binary log at the first event having a
-              datetime equal or posterior to the
-              <replaceable>datetime</replaceable> argument. See the
-              description of the <option>--start-datetime</option>
-              option for information about the
-              <replaceable>datetime</replaceable> value. This option is
-              available as of MySQL 4.1.4. It is useful for
-              point-in-time recovery.
+              timestamp equal or posterior to the
+              <replaceable>datetime</replaceable> argument. This option
+              is useful for point-in-time recovery. See the description
+              of the <option>--start-datetime</option> option for
+              information about the <replaceable>datetime</replaceable>
+              value. This option is available as of MySQL 4.1.4.
             </para>
           </listitem>
 
@@ -4826,7 +4833,7 @@
             </para>
 
             <para>
-              Do not stop at the end of the requested binary log of the
+              Do not stop at the end of the requested binary log from a
               MySQL server, but rather continue printing until the end
               of the last binary log. If you send the output to the same
               MySQL server, this may lead to an endless loop. This
@@ -4847,10 +4854,18 @@
               option and are sending the output to the same MySQL
               server. This option also is useful when restoring after a
               crash to avoid duplication of the statements you have
-              logged. <emphasis role="bold">Note</emphasis>: This option
-              requires that you have the <literal>SUPER</literal>
-              privilege. Available as of MySQL 4.1.8.
+              logged. This option is available as of MySQL 4.1.8.
             </para>
+
+            <para>
+              This option requires that you have the
+              <literal>SUPER</literal> privilege. It causes
+              <command>mysqlbinlog</command> to include a <literal>SET
+              SQL_LOG_BIN=0</literal> statement in its output to disable
+              binary logging of the remaining output. The
+              <literal>SET</literal> statement is ineffective unless you
+              have the <literal>SUPER</literal> privilege.
+            </para>
           </listitem>
 
           <listitem>
@@ -4911,14 +4926,14 @@
 
         <para>
           You can pipe the output of <command>mysqlbinlog</command> into
-          a <command>mysql</command> client to execute the statements
+          the <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
           crash when you have an old backup (see
-          <xref linkend="backup"/>):
+          <xref linkend="backup"/>). For example:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4926,7 +4941,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.[0-9]* | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4941,12 +4956,12 @@
 
         <para>
           <command>mysqlbinlog</command> has the
-          <option>--position</option> option, which prints only those
-          statements with an offset in the binary log greater than or
-          equal to a given position (the given position must match the
-          start of one event). It also has options to stop or start when
-          it sees an event of a given date and time. This enables you to
-          perform point-in-time recovery using the
+          <option>--start-position</option> option, which prints only
+          those statements with an offset in the binary log greater than
+          or equal to a given position (the given position must match
+          the start of one event). It also has options to stop and start
+          when it sees an event with a given date and time. This enables
+          you to perform point-in-time recovery using the
           <option>--stop-datetime</option> option (to be able to say,
           for example, <quote>roll forward my databases to how they were
           today at 10:30 AM</quote>).
@@ -4960,8 +4975,8 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql # DANGER!!</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 | mysql # DANGER!!</userinput>
 </programlisting>
 
         <para>
@@ -4978,20 +4993,21 @@
         <para>
           To avoid problems like this, use a <emphasis>single</emphasis>
           connection to execute the contents of all binary logs that you
-          want to process. Here is one way to do this:
+          want to process. Here is one way to do so:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 <replaceable>hostname</replaceable>-bin.000002 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 binlog.000002 | mysql</userinput>
 </programlisting>
 
         <para>
-          Another approach is to do this:
+          Another approach is to write all the logs to a single file and
+          then process the file:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 &gt;  /tmp/statements.sql</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 &gt;&gt; /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 &gt;  /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 &gt;&gt; /tmp/statements.sql</userinput>
 shell&gt; <userinput>mysql -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
@@ -5029,7 +5045,7 @@
           should delete the temporary files yourself after you no longer
           need the statement log. The files can be found in the
           temporary file directory and have names like
-          <filename>original_file_name-#-#</filename>.
+          <replaceable>original_file_name-#-#</replaceable>.
         </para>
 
         <remark role="note">
@@ -6043,7 +6059,7 @@
             </para>
 
             <para>
-              Deprecated, renamed to <option>--lock-all-tables</option>
+              Deprecated. Renamed to <option>--lock-all-tables</option>
               in MySQL 4.1.8.
             </para>
           </listitem>

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-19 21:17:55 UTC (rev 936)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-19 21:18:11 UTC (rev 937)
@@ -4484,26 +4484,30 @@
           <filename>binlog.000003</filename>. Event information includes
           the statement executed, the time the statement took, the
           thread ID of the client that issued it, the timestamp when it
-          was issued, and so forth.
+          was executed, and so forth.
         </para>
 
         <para>
+          The output from <command>mysqlbinlog</command> can be
+          re-executed (for example, by using it as input to
+          <command>mysql</command>) to reapply the statements in the
+          log. This is useful for recovery operations after a server
+          crash. For other usage examples, see the discussion later in
+          this section.
+        </para>
+
+        <para>
           Normally, you use <command>mysqlbinlog</command> to read
           binary log files directly and apply them to the local MySQL
           server. It is also possible to read binary logs from a remote
           server by using the <option>--read-from-remote-server</option>
-          option.
-        </para>
-
-        <para>
-          When you read remote binary logs, the connection parameter
-          options can be given to indicate how to connect to the server,
-          but they are ignored unless you also specify the
-          <option>--read-from-remote-server</option> option. These
-          options are <option>--host</option>,
+          option. When you read remote binary logs, the connection
+          parameter options can be given to indicate how to connect to
+          the server. These options are <option>--host</option>,
           <option>--password</option>, <option>--port</option>,
           <option>--protocol</option>, <option>--socket</option>, and
-          <option>--user</option>.
+          <option>--user</option>; they are ignored except when you also
+          use the <option>--read-from-remote-server</option> option.
         </para>
 
         <para>
@@ -4513,8 +4517,9 @@
         </para>
 
         <para>
-          <xref linkend="binary-log"/>, discusses the binary log
-          further.
+          Binary logs and relay logs are discussed further in
+          <xref linkend="binary-log"/>, and
+          <xref linkend="slave-logs"/>. further.
         </para>
 
         <para>
@@ -4565,8 +4570,9 @@
 
             <para>
               Display a hex dump of the log in comments. This output can
-              be helpful for replication debugging. This option was
-              added in MySQL 5.0.16.
+              be helpful for replication debugging. Hex dump format is
+              discussed later in this section. This option was added in
+              MySQL 5.0.16.
             </para>
           </listitem>
 
@@ -4601,7 +4607,8 @@
             </para>
 
             <para>
-              Skip the first <replaceable>N</replaceable> entries.
+              Skip the first <replaceable>N</replaceable> entries in the
+              log.
             </para>
           </listitem>
 
@@ -4647,7 +4654,7 @@
             </para>
 
             <para>
-              Deprecated, use <option>--start-position</option> instead.
+              Deprecated. Use <option>--start-position</option> instead.
             </para>
           </listitem>
 
@@ -4668,9 +4675,10 @@
             </para>
 
             <para>
-              Read the binary log from a MySQL server. Any connection
-              parameter options are ignored unless this option is given
-              as well. These options are <option>--host</option>,
+              Read the binary log from a MySQL server rather than
+              reading a local log file. Any connection parameter options
+              are ignored unless this option is given as well. These
+              options are <option>--host</option>,
               <option>--password</option>, <option>--port</option>,
               <option>--protocol</option>, <option>--socket</option>,
               and <option>--user</option>.
@@ -4719,7 +4727,7 @@
 
             <para>
               Start reading the binary log at the first event having a
-              datetime equal to or later than the
+              timestamp equal to or later than the
               <replaceable>datetime</replaceable> argument. The
               <replaceable>datetime</replaceable> value is relative to
               the local time zone on the machine where you run
@@ -4729,11 +4737,12 @@
             </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog --start-datetime="2004-12-25 11:25:56" binlog.000003</userinput>
+shell&gt; <userinput>mysqlbinlog --start-datetime="2005-12-25 11:25:56" binlog.000003</userinput>
 </programlisting>
 
             <para>
-              This option is useful for point-in-time recovery.
+              This option is useful for point-in-time recovery. See
+              <xref linkend="backup-policy"/>.
             </para>
           </listitem>
 
@@ -4744,12 +4753,12 @@
 
             <para>
               Stop reading the binary log at the first event having a
-              datetime equal or posterior to the
-              <replaceable>datetime</replaceable> argument. See the
-              description of the <option>--start-datetime</option>
-              option for information about the
-              <replaceable>datetime</replaceable> value. It is useful
-              for point-in-time recovery.
+              timestamp equal or posterior to the
+              <replaceable>datetime</replaceable> argument. This option
+              is useful for point-in-time recovery. See the description
+              of the <option>--start-datetime</option> option for
+              information about the <replaceable>datetime</replaceable>
+              value.
             </para>
           </listitem>
 
@@ -4783,7 +4792,7 @@
             </para>
 
             <para>
-              Do not stop at the end of the requested binary log of the
+              Do not stop at the end of the requested binary log from a
               MySQL server, but rather continue printing until the end
               of the last binary log. If you send the output to the same
               MySQL server, this may lead to an endless loop. This
@@ -4803,10 +4812,18 @@
               option and are sending the output to the same MySQL
               server. This option also is useful when restoring after a
               crash to avoid duplication of the statements you have
-              logged. <emphasis role="bold">Note</emphasis>: This option
-              requires that you have the <literal>SUPER</literal>
-              privilege.
+              logged.
             </para>
+
+            <para>
+              This option requires that you have the
+              <literal>SUPER</literal> privilege. It causes
+              <command>mysqlbinlog</command> to include a <literal>SET
+              SQL_LOG_BIN=0</literal> statement in its output to disable
+              binary logging of the remaining output. The
+              <literal>SET</literal> statement is ineffective unless you
+              have the <literal>SUPER</literal> privilege.
+            </para>
           </listitem>
 
           <listitem>
@@ -4867,14 +4884,14 @@
 
         <para>
           You can pipe the output of <command>mysqlbinlog</command> into
-          a <command>mysql</command> client to execute the statements
+          the <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
           crash when you have an old backup (see
-          <xref linkend="backup"/>):
+          <xref linkend="backup"/>). For example:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4882,7 +4899,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.[0-9]* | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4897,12 +4914,12 @@
 
         <para>
           <command>mysqlbinlog</command> has the
-          <option>--position</option> option, which prints only those
-          statements with an offset in the binary log greater than or
-          equal to a given position (the given position must match the
-          start of one event). It also has options to stop or start when
-          it sees an event of a given date and time. This enables you to
-          perform point-in-time recovery using the
+          <option>--start-position</option> option, which prints only
+          those statements with an offset in the binary log greater than
+          or equal to a given position (the given position must match
+          the start of one event). It also has options to stop and start
+          when it sees an event with a given date and time. This enables
+          you to perform point-in-time recovery using the
           <option>--stop-datetime</option> option (to be able to say,
           for example, <quote>roll forward my databases to how they were
           today at 10:30 AM</quote>).
@@ -4916,8 +4933,8 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql # DANGER!!</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 | mysql # DANGER!!</userinput>
 </programlisting>
 
         <para>
@@ -4934,20 +4951,21 @@
         <para>
           To avoid problems like this, use a <emphasis>single</emphasis>
           connection to execute the contents of all binary logs that you
-          want to process. Here is one way to do this:
+          want to process. Here is one way to do so:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 <replaceable>hostname</replaceable>-bin.000002 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 binlog.000002 | mysql</userinput>
 </programlisting>
 
         <para>
-          Another approach is to do this:
+          Another approach is to write all the logs to a single file and
+          then process the file:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 &gt;  /tmp/statements.sql</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 &gt;&gt; /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 &gt;  /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 &gt;&gt; /tmp/statements.sql</userinput>
 shell&gt; <userinput>mysql -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
@@ -4980,7 +4998,7 @@
           should delete the temporary files yourself after you no longer
           need the statement log. The files can be found in the
           temporary file directory and have names like
-          <filename>original_file_name-#-#</filename>.
+          <replaceable>original_file_name-#-#</replaceable>.
         </para>
 
         <remark role="note">
@@ -5029,7 +5047,8 @@
 </programlisting>
 
         <para>
-          The hex dump output contains the following elements:
+          Hex dump output currently contains the following elements.
+          This format might change in the future.
         </para>
 
         <itemizedlist>
@@ -5044,77 +5063,165 @@
           <listitem>
             <para>
               <literal>Timestamp</literal>: The event timestamp. In the
-              example just shown, <literal>'9d fc 5c 43'</literal> is
-              the representation of <literal>'051024 17:24:13'</literal>
-              in hexadecimal.
+              example shown, <literal>'9d fc 5c 43'</literal> is the
+              representation of <literal>'051024 17:24:13'</literal> in
+              hexadecimal.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Type</literal>: The type of the log event.
-              <literal>'0f'</literal> means that the example event is a
-              <literal>FORMAT_DESCRIPTION_EVENT</literal>. The types
-              are:
+              <literal>Type</literal>: The type of the log event. In the
+              example shown, <literal>'0f'</literal> means that the
+              example event is a
+              <literal>FORMAT_DESCRIPTION_EVENT</literal>. The following
+              table lists the possible types.
             </para>
 
-<programlisting>
-00  UNKNOWN_EVENT
-    This event should never be present in the log.
-01  START_EVENT_V3
-    This indicates the start of a log file written by MySQL 4 or earlier.
-02  QUERY_EVENT
-    The most common type of events.  These contain queries executed
-    on the master.
-03  STOP_EVENT
-    Indicates that master has stopped.
-04  ROTATE_EVENT
-    Written when the master switches to a new log file.
-05  INTVAR_EVENT
-    Used mainly for AUTO_INCREMENT values and if the LAST_INSERT_ID()
-    function is used in the statement.
-06  LOAD_EVENT
-    Used for LOAD DATA INFILE in MySQL 3.23.
-07  SLAVE_EVENT
-    Reserved for future use.
-08  CREATE_FILE_EVENT
-    Used for LOAD DATA INFILE statements.  This indicates the start
-    of execution of such a statement.  A temporary file is created
-    on the slave.  Used in MySQL 4 only.
-09  APPEND_BLOCK_EVENT
-    Contains data for use in a LOAD DATA INFILE statement.  The
-    data is stored in the temporary file on the slave.
-0a  EXEC_LOAD_EVENT
-    Used for LOAD DATA INFILE statements.  The contents of the
-    temporary file is stored in the table on the slave.
-    Used in MySQL 4 only.
-0b  DELETE_FILE_EVENT
-    Rollback of LOAD DATA INFILE statement.  The temporary file
-    should be deleted on slave.
-0c  NEW_LOAD_EVENT
-    Used for LOAD DATA INFILE in MySQL 4 and earlier.
-0d  RAND_EVENT
-    Used to send information about random values if the RAND()
-    function is used in the query.
-0e  USER_VAR_EVENT
-    Used to replicate user variables.
-0f  FORMAT_DESCRIPTION_EVENT
-    This indicates the start of a log file written by MySQL 5 or later.
-10  XID_EVENT
-    Event indicating commit of XA transaction
-11  BEGIN_LOAD_QUERY_EVENT
-    Used for LOAD DATA statements in MySQL 5 and later.
-12  EXECUTE_LOAD_QUERY_EVENT
-    Used for LOAD DATA statements in MySQL 5 and later.
-13  TABLE_MAP_EVENT
-    Reserved for future use
-14  WRITE_ROWS_EVENT
-    Reserved for future use
-15  UPDATE_ROWS_EVENT
-    Reserved for future use
-16  DELETE_ROWS_EVENT
-    Reserved for future use
-</programlisting>
+            <informaltable>
+              <tgroup cols="3">
+                <colspec colwidth="5*"/>
+                <colspec colwidth="20*"/>
+                <colspec colwidth="75*"/>
+                <tbody>
+                  <row>
+                    <entry>Type</entry>
+                    <entry>Name</entry>
+                    <entry>Meaning</entry>
+                  </row>
+                  <row>
+                    <entry><literal>00</literal></entry>
+                    <entry><literal>UNKNOWN_EVENT</literal></entry>
+                    <entry>This event should never be present in the log.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>01</literal></entry>
+                    <entry><literal>START_EVENT_V3</literal></entry>
+                    <entry>This indicates the start of a log file written by MySQL 4 or earlier.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>02</literal></entry>
+                    <entry><literal>QUERY_EVENT</literal></entry>
+                    <entry>The most common type of events. These contain statements executed on the
+                      master.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>03</literal></entry>
+                    <entry><literal>STOP_EVENT</literal></entry>
+                    <entry>Indicates that master has stopped.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>04</literal></entry>
+                    <entry><literal>ROTATE_EVENT</literal></entry>
+                    <entry>Written when the master switches to a new log file.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>05</literal></entry>
+                    <entry><literal>INTVAR_EVENT</literal></entry>
+                    <entry>Used mainly for <literal>AUTO_INCREMENT</literal> values and when the
+                      <literal>LAST_INSERT_ID()</literal> function is
+                      used in the statement.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>06</literal></entry>
+                    <entry><literal>LOAD_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> in MySQL 3.23.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>07</literal></entry>
+                    <entry><literal>SLAVE_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>08</literal></entry>
+                    <entry><literal>CREATE_FILE_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements. This indicates
+                      the start of execution of such a statement. A
+                      temporary file is created on the slave. Used in
+                      MySQL 4 only.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>09</literal></entry>
+                    <entry><literal>APPEND_BLOCK_EVENT</literal></entry>
+                    <entry>Contains data for use in a <literal>LOAD DATA INFILE</literal>
+                      statement. The data is stored in the temporary
+                      file on the slave.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0a</literal></entry>
+                    <entry><literal>EXEC_LOAD_EVENT</literal></entry>
+                    <entry>Used for LOAD DATA INFILE statements. The contents of the temporary file
+                      is stored in the table on the slave. Used in MySQL
+                      4 only.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0b</literal></entry>
+                    <entry><literal>DELETE_FILE_EVENT</literal></entry>
+                    <entry>Rollback of a <literal>LOAD DATA INFILE</literal> statement. The
+                      temporary file should be deleted on slave.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0c</literal></entry>
+                    <entry><literal>NEW_LOAD_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> in MySQL 4 and earlier.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0d</literal></entry>
+                    <entry><literal>RAND_EVENT</literal></entry>
+                    <entry>Used to send information about random values if the
+                      <literal>RAND()</literal> function is used in the
+                      statement.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0e</literal></entry>
+                    <entry><literal>USER_VAR_EVENT</literal></entry>
+                    <entry>Used to replicate user variables.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0f</literal></entry>
+                    <entry><literal>FORMAT_DESCRIPTION_EVENT</literal></entry>
+                    <entry>This indicates the start of a log file written by MySQL 5 or later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>10</literal></entry>
+                    <entry><literal>XID_EVENT</literal></entry>
+                    <entry>Event indicating commit of an XA transaction.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>11</literal></entry>
+                    <entry><literal>BEGIN_LOAD_QUERY_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements in MySQL 5 and
+                      later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>12</literal></entry>
+                    <entry><literal>EXECUTE_LOAD_QUERY_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements in MySQL 5 and
+                      later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>13</literal></entry>
+                    <entry><literal>TABLE_MAP_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>14</literal></entry>
+                    <entry><literal>WRITE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>15</literal></entry>
+                    <entry><literal>UPDATE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>16</literal></entry>
+                    <entry><literal>DELETE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
           </listitem>
 
           <listitem>
@@ -5139,25 +5246,55 @@
 
           <listitem>
             <para>
-              <literal>Flags</literal>: 16 flags.
+              <literal>Flags</literal>: 16 flags. Currently, the
+              following flags are used. The others are reserved for the
+              future.
             </para>
 
-<programlisting>
-01  LOG_EVENT_BINLOG_IN_USE_F
-    Log file correctly closed (Used only in FORMAT_DESCRIPTION_EVENT)
-    If this flag is set (if the flags are e.g. '01 00') in an
-    FORMAT_DESCRIPTION_EVENT, then the log file has not been
-    properly closed.  Most probably because of a master crash (for
-    example, due to power failure).
-02  Reserved for future use.
-04  LOG_EVENT_THREAD_SPECIFIC_F
-    Set if the event is dependent on the connection it was
-    executed in (example '04 00'), e.g. if the event uses
-    temporary tables.
-08  LOG_EVENT_SUPPRESS_USE_F
-    Set in some circumstances when the event is not dependent on
-    the default database
-</programlisting>
+            <informaltable>
+              <tgroup cols="3">
+                <colspec colwidth="5*"/>
+                <colspec colwidth="20*"/>
+                <colspec colwidth="75*"/>
+                <tbody>
+                  <row>
+                    <entry>Flag</entry>
+                    <entry>Name</entry>
+                    <entry>Meaning</entry>
+                  </row>
+                  <row>
+                    <entry><literal>01</literal></entry>
+                    <entry><literal>LOG_EVENT_BINLOG_IN_USE_F</literal></entry>
+                    <entry>Log file correctly closed. (Used only in
+                      <literal>FORMAT_DESCRIPTION_EVENT</literal>.) If
+                      this flag is set (if the flags are, for example,
+                      <literal>'01 00'</literal>) in a
+                      <literal>FORMAT_DESCRIPTION_EVENT</literal>, the
+                      log file has not been properly closed. Most
+                      probably this is because of a master crash (for
+                      example, due to power failure).</entry>
+                  </row>
+                  <row>
+                    <entry><literal>02</literal></entry>
+                    <entry/>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>04</literal></entry>
+                    <entry><literal>LOG_EVENT_THREAD_SPECIFIC_F</literal></entry>
+                    <entry>Set if the event is dependent on the connection it was executed in (for
+                      example, <literal>'04 00'</literal>), for example,
+                      if the event uses temporary tables.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>08</literal></entry>
+                    <entry><literal>LOG_EVENT_SUPPRESS_USE_F</literal></entry>
+                    <entry>Set in some circumstances when the event is not dependent on the default
+                      database.</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
 
             <para>
               The other flags are reserved for future use.
@@ -5166,10 +5303,6 @@
 
         </itemizedlist>
 
-        <para>
-          The hex dump output format might change in later releases.
-        </para>
-
       </refsection>
 
     </refentry>
@@ -6095,7 +6228,7 @@
             </para>
 
             <para>
-              Deprecated, now renamed to
+              Deprecated. Now renamed to
               <option>--lock-all-tables</option>.
             </para>
           </listitem>

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-19 21:17:55 UTC (rev 936)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-19 21:18:11 UTC (rev 937)
@@ -4500,26 +4500,30 @@
           <filename>binlog.000003</filename>. Event information includes
           the statement executed, the time the statement took, the
           thread ID of the client that issued it, the timestamp when it
-          was issued, and so forth.
+          was executed, and so forth.
         </para>
 
         <para>
+          The output from <command>mysqlbinlog</command> can be
+          re-executed (for example, by using it as input to
+          <command>mysql</command>) to reapply the statements in the
+          log. This is useful for recovery operations after a server
+          crash. For other usage examples, see the discussion later in
+          this section.
+        </para>
+
+        <para>
           Normally, you use <command>mysqlbinlog</command> to read
           binary log files directly and apply them to the local MySQL
           server. It is also possible to read binary logs from a remote
           server by using the <option>--read-from-remote-server</option>
-          option.
-        </para>
-
-        <para>
-          When you read remote binary logs, the connection parameter
-          options can be given to indicate how to connect to the server,
-          but they are ignored unless you also specify the
-          <option>--read-from-remote-server</option> option. These
-          options are <option>--host</option>,
+          option. When you read remote binary logs, the connection
+          parameter options can be given to indicate how to connect to
+          the server. These options are <option>--host</option>,
           <option>--password</option>, <option>--port</option>,
           <option>--protocol</option>, <option>--socket</option>, and
-          <option>--user</option>.
+          <option>--user</option>; they are ignored except when you also
+          use the <option>--read-from-remote-server</option> option.
         </para>
 
         <para>
@@ -4529,8 +4533,9 @@
         </para>
 
         <para>
-          <xref linkend="binary-log"/>, discusses the binary log
-          further.
+          Binary logs and relay logs are discussed further in
+          <xref linkend="binary-log"/>, and
+          <xref linkend="slave-logs"/>. further.
         </para>
 
         <para>
@@ -4594,8 +4599,9 @@
 
             <para>
               Display a hex dump of the log in comments. This output can
-              be helpful for replication debugging. This option was
-              added in MySQL 5.1.2.
+              be helpful for replication debugging. Hex dump format is
+              discussed later in this section. This option was added in
+              MySQL 5.1.2.
             </para>
           </listitem>
 
@@ -4630,7 +4636,8 @@
             </para>
 
             <para>
-              Skip the first <replaceable>N</replaceable> entries.
+              Skip the first <replaceable>N</replaceable> entries in the
+              log.
             </para>
           </listitem>
 
@@ -4676,7 +4683,7 @@
             </para>
 
             <para>
-              Deprecated, use <option>--start-position</option> instead.
+              Deprecated. Use <option>--start-position</option> instead.
             </para>
           </listitem>
 
@@ -4697,9 +4704,10 @@
             </para>
 
             <para>
-              Read the binary log from a MySQL server. Any connection
-              parameter options are ignored unless this option is given
-              as well. These options are <option>--host</option>,
+              Read the binary log from a MySQL server rather than
+              reading a local log file. Any connection parameter options
+              are ignored unless this option is given as well. These
+              options are <option>--host</option>,
               <option>--password</option>, <option>--port</option>,
               <option>--protocol</option>, <option>--socket</option>,
               and <option>--user</option>.
@@ -4760,7 +4768,7 @@
 
             <para>
               Start reading the binary log at the first event having a
-              datetime equal to or later than the
+              timestamp equal to or later than the
               <replaceable>datetime</replaceable> argument. The
               <replaceable>datetime</replaceable> value is relative to
               the local time zone on the machine where you run
@@ -4770,11 +4778,12 @@
             </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog --start-datetime="2004-12-25 11:25:56" binlog.000003</userinput>
+shell&gt; <userinput>mysqlbinlog --start-datetime="2005-12-25 11:25:56" binlog.000003</userinput>
 </programlisting>
 
             <para>
-              This option is useful for point-in-time recovery.
+              This option is useful for point-in-time recovery. See
+              <xref linkend="backup-policy"/>.
             </para>
           </listitem>
 
@@ -4785,12 +4794,12 @@
 
             <para>
               Stop reading the binary log at the first event having a
-              datetime equal or posterior to the
-              <replaceable>datetime</replaceable> argument. See the
-              description of the <option>--start-datetime</option>
-              option for information about the
-              <replaceable>datetime</replaceable> value. It is useful
-              for point-in-time recovery.
+              timestamp equal or posterior to the
+              <replaceable>datetime</replaceable> argument. This option
+              is useful for point-in-time recovery. See the description
+              of the <option>--start-datetime</option> option for
+              information about the <replaceable>datetime</replaceable>
+              value.
             </para>
           </listitem>
 
@@ -4824,7 +4833,7 @@
             </para>
 
             <para>
-              Do not stop at the end of the requested binary log of the
+              Do not stop at the end of the requested binary log from a
               MySQL server, but rather continue printing until the end
               of the last binary log. If you send the output to the same
               MySQL server, this may lead to an endless loop. This
@@ -4844,10 +4853,18 @@
               option and are sending the output to the same MySQL
               server. This option also is useful when restoring after a
               crash to avoid duplication of the statements you have
-              logged. <emphasis role="bold">Note</emphasis>: This option
-              requires that you have the <literal>SUPER</literal>
-              privilege.
+              logged.
             </para>
+
+            <para>
+              This option requires that you have the
+              <literal>SUPER</literal> privilege. It causes
+              <command>mysqlbinlog</command> to include a <literal>SET
+              SQL_LOG_BIN=0</literal> statement in its output to disable
+              binary logging of the remaining output. The
+              <literal>SET</literal> statement is ineffective unless you
+              have the <literal>SUPER</literal> privilege.
+            </para>
           </listitem>
 
           <listitem>
@@ -4908,14 +4925,14 @@
 
         <para>
           You can pipe the output of <command>mysqlbinlog</command> into
-          a <command>mysql</command> client to execute the statements
+          the <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
           crash when you have an old backup (see
-          <xref linkend="backup"/>):
+          <xref linkend="backup"/>). For example:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4923,7 +4940,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.[0-9]* | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.[0-9]* | mysql</userinput>
 </programlisting>
 
         <para>
@@ -4938,12 +4955,12 @@
 
         <para>
           <command>mysqlbinlog</command> has the
-          <option>--position</option> option, which prints only those
-          statements with an offset in the binary log greater than or
-          equal to a given position (the given position must match the
-          start of one event). It also has options to stop or start when
-          it sees an event of a given date and time. This enables you to
-          perform point-in-time recovery using the
+          <option>--start-position</option> option, which prints only
+          those statements with an offset in the binary log greater than
+          or equal to a given position (the given position must match
+          the start of one event). It also has options to stop and start
+          when it sees an event with a given date and time. This enables
+          you to perform point-in-time recovery using the
           <option>--stop-datetime</option> option (to be able to say,
           for example, <quote>roll forward my databases to how they were
           today at 10:30 AM</quote>).
@@ -4957,8 +4974,8 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 | mysql # DANGER!!</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 | mysql # DANGER!!</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 | mysql # DANGER!!</userinput>
 </programlisting>
 
         <para>
@@ -4975,20 +4992,21 @@
         <para>
           To avoid problems like this, use a <emphasis>single</emphasis>
           connection to execute the contents of all binary logs that you
-          want to process. Here is one way to do this:
+          want to process. Here is one way to do so:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 <replaceable>hostname</replaceable>-bin.000002 | mysql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 binlog.000002 | mysql</userinput>
 </programlisting>
 
         <para>
-          Another approach is to do this:
+          Another approach is to write all the logs to a single file and
+          then process the file:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000001 &gt;  /tmp/statements.sql</userinput>
-shell&gt; <userinput>mysqlbinlog <replaceable>hostname</replaceable>-bin.000002 &gt;&gt; /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000001 &gt;  /tmp/statements.sql</userinput>
+shell&gt; <userinput>mysqlbinlog binlog.000002 &gt;&gt; /tmp/statements.sql</userinput>
 shell&gt; <userinput>mysql -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
@@ -5021,7 +5039,7 @@
           should delete the temporary files yourself after you no longer
           need the statement log. The files can be found in the
           temporary file directory and have names like
-          <filename>original_file_name-#-#</filename>.
+          <replaceable>original_file_name-#-#</replaceable>.
         </para>
 
         <remark role="note">
@@ -5070,7 +5088,8 @@
 </programlisting>
 
         <para>
-          The hex dump output contains the following elements:
+          Hex dump output currently contains the following elements.
+          This format might change in the future.
         </para>
 
         <itemizedlist>
@@ -5085,77 +5104,165 @@
           <listitem>
             <para>
               <literal>Timestamp</literal>: The event timestamp. In the
-              example just shown, <literal>'9d fc 5c 43'</literal> is
-              the representation of <literal>'051024 17:24:13'</literal>
-              in hexadecimal.
+              example shown, <literal>'9d fc 5c 43'</literal> is the
+              representation of <literal>'051024 17:24:13'</literal> in
+              hexadecimal.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Type</literal>: The type of the log event.
-              <literal>'0f'</literal> means that the example event is a
-              <literal>FORMAT_DESCRIPTION_EVENT</literal>. The types
-              are:
+              <literal>Type</literal>: The type of the log event. In the
+              example shown, <literal>'0f'</literal> means that the
+              example event is a
+              <literal>FORMAT_DESCRIPTION_EVENT</literal>. The following
+              table lists the possible types.
             </para>
 
-<programlisting>
-00  UNKNOWN_EVENT
-    This event should never be present in the log.
-01  START_EVENT_V3
-    This indicates the start of a log file written by MySQL 4 or earlier.
-02  QUERY_EVENT
-    The most common type of events.  These contain queries executed
-    on the master.
-03  STOP_EVENT
-    Indicates that master has stopped.
-04  ROTATE_EVENT
-    Written when the master switches to a new log file.
-05  INTVAR_EVENT
-    Used mainly for AUTO_INCREMENT values and if the LAST_INSERT_ID()
-    function is used in the statement.
-06  LOAD_EVENT
-    Used for LOAD DATA INFILE in MySQL 3.23.
-07  SLAVE_EVENT
-    Reserved for future use.
-08  CREATE_FILE_EVENT
-    Used for LOAD DATA INFILE statements.  This indicates the start
-    of execution of such a statement.  A temporary file is created
-    on the slave.  Used in MySQL 4 only.
-09  APPEND_BLOCK_EVENT
-    Contains data for use in a LOAD DATA INFILE statement.  The
-    data is stored in the temporary file on the slave.
-0a  EXEC_LOAD_EVENT
-    Used for LOAD DATA INFILE statements.  The contents of the
-    temporary file is stored in the table on the slave.
-    Used in MySQL 4 only.
-0b  DELETE_FILE_EVENT
-    Rollback of LOAD DATA INFILE statement.  The temporary file
-    should be deleted on slave.
-0c  NEW_LOAD_EVENT
-    Used for LOAD DATA INFILE in MySQL 4 and earlier.
-0d  RAND_EVENT
-    Used to send information about random values if the RAND()
-    function is used in the query.
-0e  USER_VAR_EVENT
-    Used to replicate user variables.
-0f  FORMAT_DESCRIPTION_EVENT
-    This indicates the start of a log file written by MySQL 5 or later.
-10  XID_EVENT
-    Event indicating commit of XA transaction
-11  BEGIN_LOAD_QUERY_EVENT
-    Used for LOAD DATA statements in MySQL 5 and later.
-12  EXECUTE_LOAD_QUERY_EVENT
-    Used for LOAD DATA statements in MySQL 5 and later.
-13  TABLE_MAP_EVENT
-    Reserved for future use
-14  WRITE_ROWS_EVENT
-    Reserved for future use
-15  UPDATE_ROWS_EVENT
-    Reserved for future use
-16  DELETE_ROWS_EVENT
-    Reserved for future use
-</programlisting>
+            <informaltable>
+              <tgroup cols="3">
+                <colspec colwidth="5*"/>
+                <colspec colwidth="20*"/>
+                <colspec colwidth="75*"/>
+                <tbody>
+                  <row>
+                    <entry>Type</entry>
+                    <entry>Name</entry>
+                    <entry>Meaning</entry>
+                  </row>
+                  <row>
+                    <entry><literal>00</literal></entry>
+                    <entry><literal>UNKNOWN_EVENT</literal></entry>
+                    <entry>This event should never be present in the log.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>01</literal></entry>
+                    <entry><literal>START_EVENT_V3</literal></entry>
+                    <entry>This indicates the start of a log file written by MySQL 4 or earlier.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>02</literal></entry>
+                    <entry><literal>QUERY_EVENT</literal></entry>
+                    <entry>The most common type of events. These contain statements executed on the
+                      master.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>03</literal></entry>
+                    <entry><literal>STOP_EVENT</literal></entry>
+                    <entry>Indicates that master has stopped.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>04</literal></entry>
+                    <entry><literal>ROTATE_EVENT</literal></entry>
+                    <entry>Written when the master switches to a new log file.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>05</literal></entry>
+                    <entry><literal>INTVAR_EVENT</literal></entry>
+                    <entry>Used mainly for <literal>AUTO_INCREMENT</literal> values and when the
+                      <literal>LAST_INSERT_ID()</literal> function is
+                      used in the statement.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>06</literal></entry>
+                    <entry><literal>LOAD_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> in MySQL 3.23.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>07</literal></entry>
+                    <entry><literal>SLAVE_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>08</literal></entry>
+                    <entry><literal>CREATE_FILE_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements. This indicates
+                      the start of execution of such a statement. A
+                      temporary file is created on the slave. Used in
+                      MySQL 4 only.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>09</literal></entry>
+                    <entry><literal>APPEND_BLOCK_EVENT</literal></entry>
+                    <entry>Contains data for use in a <literal>LOAD DATA INFILE</literal>
+                      statement. The data is stored in the temporary
+                      file on the slave.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0a</literal></entry>
+                    <entry><literal>EXEC_LOAD_EVENT</literal></entry>
+                    <entry>Used for LOAD DATA INFILE statements. The contents of the temporary file
+                      is stored in the table on the slave. Used in MySQL
+                      4 only.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0b</literal></entry>
+                    <entry><literal>DELETE_FILE_EVENT</literal></entry>
+                    <entry>Rollback of a <literal>LOAD DATA INFILE</literal> statement. The
+                      temporary file should be deleted on slave.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0c</literal></entry>
+                    <entry><literal>NEW_LOAD_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> in MySQL 4 and earlier.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0d</literal></entry>
+                    <entry><literal>RAND_EVENT</literal></entry>
+                    <entry>Used to send information about random values if the
+                      <literal>RAND()</literal> function is used in the
+                      statement.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0e</literal></entry>
+                    <entry><literal>USER_VAR_EVENT</literal></entry>
+                    <entry>Used to replicate user variables.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>0f</literal></entry>
+                    <entry><literal>FORMAT_DESCRIPTION_EVENT</literal></entry>
+                    <entry>This indicates the start of a log file written by MySQL 5 or later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>10</literal></entry>
+                    <entry><literal>XID_EVENT</literal></entry>
+                    <entry>Event indicating commit of an XA transaction.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>11</literal></entry>
+                    <entry><literal>BEGIN_LOAD_QUERY_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements in MySQL 5 and
+                      later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>12</literal></entry>
+                    <entry><literal>EXECUTE_LOAD_QUERY_EVENT</literal></entry>
+                    <entry>Used for <literal>LOAD DATA INFILE</literal> statements in MySQL 5 and
+                      later.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>13</literal></entry>
+                    <entry><literal>TABLE_MAP_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>14</literal></entry>
+                    <entry><literal>WRITE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>15</literal></entry>
+                    <entry><literal>UPDATE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>16</literal></entry>
+                    <entry><literal>DELETE_ROWS_EVENT</literal></entry>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
           </listitem>
 
           <listitem>
@@ -5180,25 +5287,55 @@
 
           <listitem>
             <para>
-              <literal>Flags</literal>: 16 flags.
+              <literal>Flags</literal>: 16 flags. Currently, the
+              following flags are used. The others are reserved for the
+              future.
             </para>
 
-<programlisting>
-01  LOG_EVENT_BINLOG_IN_USE_F
-    Log file correctly closed (Used only in FORMAT_DESCRIPTION_EVENT)
-    If this flag is set (if the flags are e.g. '01 00') in an
-    FORMAT_DESCRIPTION_EVENT, then the log file has not been
-    properly closed.  Most probably because of a master crash (for
-    example, due to power failure).
-02  Reserved for future use.
-04  LOG_EVENT_THREAD_SPECIFIC_F
-    Set if the event is dependent on the connection it was
-    executed in (example '04 00'), e.g. if the event uses
-    temporary tables.
-08  LOG_EVENT_SUPPRESS_USE_F
-    Set in some circumstances when the event is not dependent on
-    the default database
-</programlisting>
+            <informaltable>
+              <tgroup cols="3">
+                <colspec colwidth="5*"/>
+                <colspec colwidth="20*"/>
+                <colspec colwidth="75*"/>
+                <tbody>
+                  <row>
+                    <entry>Flag</entry>
+                    <entry>Name</entry>
+                    <entry>Meaning</entry>
+                  </row>
+                  <row>
+                    <entry><literal>01</literal></entry>
+                    <entry><literal>LOG_EVENT_BINLOG_IN_USE_F</literal></entry>
+                    <entry>Log file correctly closed. (Used only in
+                      <literal>FORMAT_DESCRIPTION_EVENT</literal>.) If
+                      this flag is set (if the flags are, for example,
+                      <literal>'01 00'</literal>) in a
+                      <literal>FORMAT_DESCRIPTION_EVENT</literal>, the
+                      log file has not been properly closed. Most
+                      probably this is because of a master crash (for
+                      example, due to power failure).</entry>
+                  </row>
+                  <row>
+                    <entry><literal>02</literal></entry>
+                    <entry/>
+                    <entry>Reserved for future use.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>04</literal></entry>
+                    <entry><literal>LOG_EVENT_THREAD_SPECIFIC_F</literal></entry>
+                    <entry>Set if the event is dependent on the connection it was executed in (for
+                      example, <literal>'04 00'</literal>), for example,
+                      if the event uses temporary tables.</entry>
+                  </row>
+                  <row>
+                    <entry><literal>08</literal></entry>
+                    <entry><literal>LOG_EVENT_SUPPRESS_USE_F</literal></entry>
+                    <entry>Set in some circumstances when the event is not dependent on the default
+                      database.</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
 
             <para>
               The other flags are reserved for future use.
@@ -5207,10 +5344,6 @@
 
         </itemizedlist>
 
-        <para>
-          The hex dump output format might change in later releases.
-        </para>
-
       </refsection>
 
     </refentry>
@@ -6136,7 +6269,7 @@
             </para>
 
             <para>
-              Deprecated, now renamed to
+              Deprecated. Now renamed to
               <option>--lock-all-tables</option>.
             </para>
           </listitem>

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