Merge lp:~hrvojem/percona-xtradb-cluster/bug918568 into lp:~percona-dev/percona-xtradb-cluster/5.5.17-22.1

[Hrvoje Matijakovic]

[Vadim Tkachenko (vadim-tk)]

I see merge conflict there

+<<<<<<< TREE

review: Needs Fixing

[Vadim Tkachenko (vadim-tk)]

good now

review: Approve

=== modified file 'doc/source/faq.rst'
--- doc/source/faq.rst	2012-01-17 15:50:42 +0000
+++ doc/source/faq.rst	2012-01-30 19:54:24 +0000
@@ -7,7 +7,7 @@
 A: For auto-increment particular, Cluster changes auto_increment_offset
 for each new node.
 In the single node workload, locking handled by usual way how |InnoDB| handles locks. 
-In case of write load on several nodes, Cluster uses optimistic locking (http://en.wikipedia.org/wiki/Optimistic_concurrency_control) and application may receive lock error in the response on COMMIT query.
+In case of write load on several nodes, Cluster uses `optimistic locking <http://en.wikipedia.org/wiki/Optimistic_concurrency_control>`_ and application may receive lock error in the response on COMMIT query.
 
 Q: What if one of the nodes crashes and innodb recovery roll back some transactions? 
 =====================================================================================
@@ -34,6 +34,13 @@
   
   wsrep_provider_options="pc.ignore_sb = yes"
 
+Q: Is it possible to set up cluster without state transfer
+==========================================================
+A: It is possible in two ways:
+
+1. by default Galera reads starting position from a text file <datadir>/grastate.dat. Just make this file identical on all nodes, and there will be no state transfer upon start.
+2. wsrep_start_position variable - start the nodes with the same *UUID:seqno* value and there you are.
+
 Q: I have a two nodes setup. When node1 fails, node2 does not accept commands, why?
 ====================================================================================
 A: This is expected behaviour, to prevent |split brain|. See previous question.
 
=== modified file 'doc/source/glossary.rst'
--- doc/source/glossary.rst	2012-01-18 14:14:48 +0000
+++ doc/source/glossary.rst	2012-01-30 19:54:24 +0000
@@ -11,10 +11,10 @@
       Storage engine which provides ACID-compliant transactions and foreign key support, among others improvements over :term:`MyISAM`. It is the default engine for |MySQL| as of the 5.5 series.
 
    MyISAM
-     Previous default storage engine for |MySQL| for versions prior to 5.5. It doesn't fully support transactions but in some scenarios may be faster than :term:`InnoDB`. Each table is stored on disk in 3 files: :term:`.frm`, :term:`.MYD`, :term:`.MYI`
+     Previous default storage engine for |MySQL| for versions prior to 5.5. It doesn't fully support transactions but in some scenarios may be faster than :term:`InnoDB`. Each table is stored on disk in 3 files: :term:`.frm`, :term:`.MYD`, :term:`.MYI`.
 	
    IST
-     Incremental State Transfer. Functionallity which instead of whole state snapshot can catch up with te group by receiving the missing writesets, but only if the writeset is still in the donor's writeset cache
+     Incremental State Transfer. Functionallity which instead of whole state snapshot can catch up with te group by receiving the missing writesets, but only if the writeset is still in the donor's writeset cache.
 
    XtraBackup
      *Percona XtraBackup* is an open-source hot backup utility for |MySQL| - based servers that doesn’t lock your database during the backup.
@@ -23,10 +23,10 @@
      *Percona XtraDB* is an enhanced version of the InnoDB storage engine, designed to better scale on modern hardware, and including a variety of other features useful in high performance environments. It is fully backwards compatible, and so can be used as a drop-in replacement for standard InnoDB. More information `here <http://www.percona.com/docs/wiki/Percona-XtraDB:start>`_ .
 
    XtraDB Cluster
-     *Percona XtraDB Cluster* is a high availability solution for MySQL
+     *Percona XtraDB Cluster* is a high availability solution for MySQL.
 
    Percona XtraDB Cluster
-     *Percona XtraDB Cluster* is a high availability solution for MySQL
+     *Percona XtraDB Cluster* is a high availability solution for MySQL.
 
    my.cnf
      This file refers to the database server's main configuration file. Most Linux distributions place it as :file:`/etc/mysql/my.cnf`, but the location and name depends on the particular installation. Note that this is not the only way of configuring the server, some systems does not have one even and rely on the command options to start the server and its defaults values.