bk commit - mysqldoc@docsrva tree (jon:1.2733)

[jon]

Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2733 05/06/01 12:12:34 jon@stripped +1 -0
  Cluster: Added note about replication to FAQ.

  Docs/manual.texi
    1.2958 05/06/01 12:12:29 jon@stripped +6 -2
    Cluster: Added note about replication to FAQ.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jon
# Host:	gigan.site
# Root:	/home/jon/bk/mysqldoc

--- 1.2957/Docs/manual.texi	2005-06-01 02:07:56 +10:00
+++ 1.2958/Docs/manual.texi	2005-06-01 12:12:29 +10:00
@@ -60936,7 +60936,7 @@
         [SUBJECT '@var{subject}']]
     [WITH @var{with_option} [@var{with_option}] ...]
 
-@var{object_type} = 
+@var{object_type} =
     TABLE
   | FUNCTION
   | PROCEDURE
@@ -76609,8 +76609,12 @@
 committed by any one data node is committed for all data nodes. In the event of
 a data node failure, all remaining data nodes will remain in a consistent state.
 
-In short, whereas MySQL replication is asynchronous, MySQL Cluster is
+In short, whereas standard MySQL replication is asynchronous, MySQL Cluster is
 synchronous.
+
+We are planning to implement (asynchronous) replication for Cluster in MySQL
+5.1. This will include the capability to replicate both between two clusters and
+between a MySQL cluster and a non-Cluster MySQL server.
 
 @item
 @emph{Do I need to do any special networking to run Cluster? (How do computers