Merge lp:~hrvojem/percona-xtrabackup/bug1100008-2.1 into lp:percona-xtrabackup/2.1

[Hrvoje Matijakovic]

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

review: Approve

[Alexey Kopytov (akopytov)]

Was changing "Percona Ireland Ltd" back to "Percona Inc." intentional?

=== modified file 'doc/source/innobackupex/incremental_backups_innobackupex.rst'
--- doc/source/innobackupex/incremental_backups_innobackupex.rst	2012-06-04 10:29:26 +0000
+++ doc/source/innobackupex/incremental_backups_innobackupex.rst	2013-01-17 15:19:26 +0000
@@ -69,7 +69,7 @@
 
  * Then, the uncommitted transaction must be rolled back in order to have a ready-to-use backup.
 
-If you replay the commit ed transactions **and** rollback the uncommitted ones on the base backup, you will not be able to add the incremental ones. If you do this on an incremental one, you won't be able to add data from that moment and the remaining increments.
+If you replay the commited transactions **and** rollback the uncommitted ones on the base backup, you will not be able to add the incremental ones. If you do this on an incremental one, you won't be able to add data from that moment and the remaining increments.
 
 Having this in mind, the procedure is very straight-forward using the :option:`--redo-only` option, starting with the base backup: ::
 
@@ -99,6 +99,10 @@
 
 If the "completed OK!" message was shown, the final data will be in the base backup directory, ``BASE-DIR``.
 
+.. note::
+ 
+ :option:`--redo-only` should be used when merging all incrementals except the last one. That's why the previous line doesn't contain the :option:`--redo-only` option. Even if the :option:`--redo-only` was used on the last step, backup would still be consistent but in that case server would perform the rollback phase.
+
 You can use this procedure to add more increments to the base, as long as you do it in the chronological order that the backups were done. If you omit this order, the backup will be useless. If you have doubts about the order that they must be applied, you can check the file :file:`xtrabackup_checkpoints` at the directory of each one, as shown in the beginning of this section.
 
 Once you put all the parts together, you can prepare again the full backup (base + incrementals) once again to rollback the uncommitted transactions: ::
@@ -123,19 +127,19 @@
 
 Incremental streaming backups can be performed with the |xbstream| streaming option. Currently backups are packed in custom **xbstream** format. With this feature taking a BASE backup is needed as well. 
 
- Taking a base backup: :: 
+Taking a base backup: :: 
  
   innobackupex /data/backups
 
- Taking a local backup: ::
+Taking a local backup: ::
 
   innobackupex --incremental --incremental-lsn=LSN-number --stream=xbstream ./ > incremental.xbstream
 
- Unpacking the backup: ::
+Unpacking the backup: ::
 
   xbstream -x < incremental.xbstream 
 
- Taking a local backup and streaming it to the remote server and unpacking it: :: 
+Taking a local backup and streaming it to the remote server and unpacking it: :: 
 
   innobackupex  --incremental --incremental-lsn=LSN-number --stream=xbstream ./ | /
   ssh user@hostname " cat - | xbstream -x -C > /backup-dir/"

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2013-01-15 12:00:03 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2013-01-17 15:19:26 +0000
@@ -96,8 +96,8 @@
 
 .. option:: --no-lock
 
-   Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup.
-   If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using :option:`--no-lock`
+   Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup. This option shouldn't be used if there are any ``DDL`` statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the *mysql* database), otherwise it could lead to an inconsistent backup. 
+   If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using this option.
 
 .. option:: --no-timestamp
 
@@ -117,7 +117,7 @@
 
 .. option:: --redo-only
 
-   This option is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
+   This option should be used when preparing the base full backup and when merging all incrementals except the last one. It is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
 
 .. option:: --rsync
 

=== modified file 'doc/source/innobackupex/privileges.rst'
--- doc/source/innobackupex/privileges.rst	2012-07-31 04:46:23 +0000
+++ doc/source/innobackupex/privileges.rst	2013-01-17 15:19:26 +0000
@@ -64,6 +64,9 @@
 .. code-block:: sql
 
   mysql> CREATE USER 'bkpuser'@'localhost' IDENTIFIED BY 's3cret';
-  mysql> REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'bkpuser';
   mysql> GRANT RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO 'bkpuser'@'localhost';
   mysql> FLUSH PRIVILEGES;
+
+.. note::
+
+ Connection-related parameters are only recognized in the [client] and [mysql] groups in configuration files. Adding custom groups like [xtrabackup] will work only if XtraBackup binary is used, it will not work with the innobackupex.

=== modified file 'doc/source/installation/compiling_xtrabackup.rst'
--- doc/source/installation/compiling_xtrabackup.rst	2012-11-22 09:55:05 +0000
+++ doc/source/installation/compiling_xtrabackup.rst	2013-01-17 15:19:26 +0000
@@ -4,7 +4,7 @@
 
 The source code is available from the *Launchpad* project `here <https://launchpad.net/percona-xtrabackup>`_. The easiest way to get the code is with :command:`bzr branch` of the desired release, such as the following: ::
 
-  bzr branch lp:percona-xtrabackup/2.0
+  bzr branch lp:percona-xtrabackup/2.1
 
 You should then have a directory named after the release you branched, such as ``percona-xtrabackup``.
 
@@ -25,7 +25,7 @@
 In ``RPM``-based distributions, you need to: ::
 
   $ yum install cmake gcc gcc-c++ libaio libaio-devel automake autoconf bzr \
-    bison libtool ncurses5-devel
+    bison libtool ncurses-devel zlib-devel
 
 Compiling with :command:`build.sh`
 ----------------------------------
@@ -37,8 +37,8 @@
   ================== =========  ============================================
   Value              Alias      Server
   ================== =========  ============================================
-  innodb51           plugin	build against InnoDB plugin in MySQL 5.1
-  innodb55           5.5	build against InnoDB in MySQL 5.5
+  innodb51           plugin		build against InnoDB plugin in MySQL 5.1
+  innodb55           5.5		build against InnoDB in MySQL 5.5
   xtradb51           xtradb     build against Percona Server with XtraDB 5.1
   xtradb55           xtradb55   build against Percona Server with XtraDB 5.5
   ================== =========  ============================================
@@ -51,4 +51,4 @@
 
 and you go for a coffee, at your return |XtraBackup| will be ready to be used. The |xtrabackup| binary will be located in the ``percona-xtrabackup/src`` subdirectory.
 
-After this you'll need to copy innobackupex and the corresponding xtrabackup binary to some directory listed in the PATH environment variable, e.g. /usr/bin.
+After this you’ll need to copy |innobackupex| (in the root folder used to retrieve |XtraBackup|) and the corresponding xtrabackup binary (in the src folder) to some directory listed in the PATH environment variable, e.g. ``/usr/bin``.

=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2013-01-11 13:00:50 +0000
+++ doc/source/percona-theme/layout.html	2013-01-17 15:19:26 +0000
@@ -61,7 +61,9 @@
 						            [phone] (USA - Sales)
 						          </div>
 						          <div style="padding-bottom: 4px;">
-						            [phone] (UK - Sales)
+						            [phone] (UK - Sales)<br />
+                        0-800-051-8984 (UK - Sales)<br />
+                        0-800-181-0665 (GER - Sales)<br />
 						          </div>
 									<div style="padding-bottom: 4px;">
 										[phone] (Emergency)
@@ -202,12 +204,12 @@
  <!-- <div id="stickywrapper"> -->
  <!--    <div id="stickycontent"> -->
   <div id="header"><div class="header">
-    <div class="logo"><a href="http://www.percona.com/" onfocus="this.blur()"><img src="http://s3.percona.com/ui-logo.png" alt="Percona Performance Consulting Experts" width="240" height="55" /></a></div>
+    <div class="logo"><a href="http://www.percona.com/" onfocus="this.blur()"><img src="http://s3.percona.com/ui-logo.png" alt="Percona Performance Consulting Experts" width="220" height="55" /></a></div>
     <div class="right">
       <div class="searchlink"><a onmouseover="SEARCH.Open()"><img id="searchlink-anchor" src="http://s2.percona.com/ui-search.png" alt="" /></a></div>
       <span class="inv"><![CDATA[<noindex>]]></span>
      	<div class="navicontainer"><div class="navi">
-		<span id="navilink-span-menu-914"><a href="/about-percona" title="" id="navilink-a-menu-914">About</a></span><span id="navilink-span-menu-915"><a href="/products" title="" id="navilink-a-menu-915">Products</a></span><span id="navilink-span-menu-916"><a href="/software" id="navilink-a-menu-916">Software</a></span><span id="navilink-span-menu-918"><a href="/resources" title="" id="navilink-a-menu-918">Resources</a></span><span id="navilink-span-menu-919"><a href="/news-and-events" title="" id="navilink-a-menu-919">News &amp; Events</a></span><span id="navilink-span-menu-920"><a href="/contact" id="navilink-a-menu-920">Contact Us</a></span><span id="navilink-span-menu-1060"><a href="/live" title="" id="navilink-a-menu-1060">Percona Live</a></span>	      </div></div>
+      <span id="navilink-span-menu-914"><a id="navilink-a-menu-914" href="/about-percona">About</a></span><span id="navilink-span-menu-915"><a id="navilink-a-menu-915" href="/products">Products</a></span><span id="navilink-span-menu-1125"><a id="navilink-a-menu-1125" title="" href="/software">Software</a></span><span id="navilink-span-menu-918"><a id="navilink-a-menu-918" href="/resources">Resources</a></span><span id="navilink-span-menu-919"><a id="navilink-a-menu-919" title="" href="/news-and-events">News/Events</a></span><span id="navilink-span-menu-1129"><a id="navilink-a-menu-1129" href="/percona-community">Community</a></span><span id="navilink-span-menu-920"><a id="navilink-a-menu-920" title="" href="/contact">Contact</a></span><span id="navilink-span-menu-1060"><a id="navilink-a-menu-1060" title="" href="/live">Percona Live</a></span>        </div></div>
 	      <span class="inv"><![CDATA[</noindex>]]></span>
 	    </div>
   	</div></div><!-- /.header /#header -->
@@ -310,7 +312,7 @@
           Call us: 1-888-316-9775 • <a href="/contact">Contact Us</a><br>
           MySQL and InnoDB are trademarks of Oracle Corp.<br>
           Proudly running <a href="/software/percona-server/">Percona Server<span id="recentServerVersion"></span></a><br>
-          Copyright &copy; 2006-2011 Percona Ireland Ltd<br>
+          Copyright &copy; 2006-2011 Percona Inc.<br>
           <a href="/about-us/policies/">Copyright, Trademark, and Privacy Policy</a> • <a href="/sitemap/">Sitemap</a>
           <span class="inv"><!--[CDATA[</noindex-->]]&gt;</span>
        </div>
@@ -319,18 +321,13 @@
    </div>
 {%- endblock %}
 <span class="inv"><!--[CDATA[<noindex-->]]&gt;</span>
-<div id="submenus">
-	<div class="navi-dropdown" id="navi-dropdown-menu-914"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/about-us/our-mission">Mission</a></div><div class="item"><a href="/about-us/our-team">Team</a></div><div class="item"><a href="/about-us/customers">Customers</a></div><div class="item"><a href="/about-us/careers">Careers</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-915"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/mysql-support">MySQL Support</a></div><div class="item"><a href="/mysql-consulting">MySQL Consulting</a></div><div class="item"><a href="/training">MySQL Training</a></div><div class="item"><a href="/development">MySQL Server Development</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-916"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/software">Percona Software for MySQL</a></div><div class="item"><a href="/software/percona-server">Percona Server with XtraDB</a></div><div class="item"><a href="/software/percona-xtradb-cluster">Percona XtraDB Cluster</a></div><div class="item"><a href="/software/percona-toolkit">Percona Toolkit</a></div><div class="item"><a href="/software/percona-monitoring-plugins">Percona Monitoring Plugins</a></div><div class="item"><a href="/software/mysql-innodb-data-recovery-tools">Data Recovery Toolkit</a></div><div class="item"><a href="/software/percona-xtrabackup">Percona XtraBackup</a></div><div class="item"><a href="/software/percona-xtradb">Percona XtraDB</a></div><div class="item"><a href="http://www.percona.com/downloads/">Downloads</a></div><div class="item"><a href="/software/repositories">Repositories</a></div><div class="item"><a href="/software/documentation">Documentation</a></div><div class="item"><a href="http://forum.percona.com">Forum</a></div><div class="item"><a href="http://groups.google.com/group/percona-discussion">Google Discussion</a></div><div class="item"><a href="https://launchpad.net/percona-server">Launchpad</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-918"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/webinars">Webinars</a></div><div class="item"><a href="/about-us/blogs">Blogs</a></div><div class="item"><a href="/about-us/presentations">Technical Presentations</a></div><div class="item"><a href="/about-us/books">Books by Percona Authors</a></div><div class="item"><a href="/about-us/mysql-white-papers">White Papers</a></div><div class="item"><a href="/about-us/mysql-case-studies">Case Studies</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-919"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/percona-news">In The News</a></div><div class="item"><a href="/about-us/pressreleases">Press Releases</a></div><div class="item"><a href="/live-2">Percona Live Conferences</a></div><div class="item"><a href="/mysql-events">MySQL Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-920"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/contact/24x7-emergency">24x7 Emergency</a></div><div class="item"><a href="/contact/sales">Sales &amp; General Inquiries</a></div><div class="item"><a href="/contact/billing">Billing Inquiries</a></div><div class="item"><a href="https://customers.percona.com/">Customer Portal Login</a></div><div class="item"><a href="/contact/phone-directory">Phone Directory</a></div><div class="item"><a href="/subscribe">Subscribe to Newsletter</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div class="navi-dropdown" id="navi-dropdown-menu-1060"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://www.percona.com/live/nyc-2012/">New York 2012</a></div><div class="item"><a href="http://www.percona.com/live/london-2012/">London 2012</a></div><div class="item"><a href="http://www.percona.com/live/mysql-conference-2012/">MySQL Conference &amp; Expo 2012</a></div><div class="item"><a href="/live">Previous Percona Live Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div>
-	
-	
-	
-	
-  <div id="search-dropdown" class="search-dropdown">
+<div id="submenus"> 
+<div id="navi-dropdown-menu-914" class="navi-dropdown" style="position: absolute; left: 401.133px; top: 96px; display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/about-us/our-mission">Mission</a></div><div class="item"><a href="/about-us/our-team">Team</a></div><div class="item"><a href="/about-us/customers">Customers</a></div><div class="item"><a href="/about-us/careers">Careers</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-915" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/mysql-support">MySQL Support</a></div><div class="item"><a href="/mysql-consulting">MySQL Consulting</a></div><div class="item"><a href="/training">MySQL Training</a></div><div class="item"><a href="/development">MySQL Server Development</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-1125" class="navi-dropdown" style="position: absolute; left: 532.933px; top: 96px; display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/software">Percona Software for MySQL</a></div><div class="item"><a href="/software/percona-server">Percona Server with XtraDB</a></div><div class="item"><a href="/software/percona-xtradb-cluster">Percona XtraDB Cluster</a></div><div class="item"><a href="/software/percona-toolkit">Percona Toolkit</a></div><div class="item"><a href="/software/percona-monitoring-plugins">Percona Monitoring Plugins</a></div><div class="item"><a href="/software/mysql-innodb-data-recovery-tools">Data Recovery Toolkit</a></div><div class="item"><a href="/software/percona-xtrabackup">Percona XtraBackup</a></div><div class="item"><a href="/software/percona-xtradb">Percona XtraDB</a></div><div class="item"><a href="/downloads">Downloads</a></div><div class="item"><a href="/software/repositories">Repositories</a></div><div class="item"><a href="/software/documentation">Documentation</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-918" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/webinars">Webinars</a></div><div class="item"><a href="https://tools.percona.com/wizard">MySQL Configuration Wizard</a></div><div class="item"><a href="https://tools.percona.com/query-advisor">MySQL Query Advisor</a></div><div class="item"><a href="/about-us/blogs">Blogs</a></div><div class="item"><a href="/about-us/presentations">Technical Presentations</a></div><div class="item"><a href="/about-us/books">Books by Percona Authors</a></div><div class="item"><a href="/about-us/mysql-white-papers">White Papers</a></div><div class="item"><a href="/about-us/mysql-case-studies">Case Studies</a></div><div class="item"><a href="http://percona.tv/">Videos</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-919" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/percona-news">In The News</a></div><div class="item"><a href="/about-us/pressreleases">Press Releases</a></div><div class="item"><a href="/live-2">Percona Live Conferences</a></div><div class="item"><a href="/mysql-events">MySQL Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-1129" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://forum.percona.com/">Forums</a></div><div class="item"><a href="http://groups.google.com/group/percona-discussion">Google Discussion Group</a></div><div class="item"><a href="https://launchpad.net/percona-server">Launchpad</a></div><div class="item"><a href="http://www.mysqlperformanceblog.com/">MySQL Performance Blog</a></div><div class="item"><a href="http://twitter.com/percona">Twitter</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-920" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="/contact/24x7-emergency">24x7 Emergency</a></div><div class="item"><a href="/contact/sales">Sales &amp; General Inquiries</a></div><div class="item"><a href="/contact/billing">Billing Inquiries</a></div><div class="item"><a href="https://customers.percona.com/">Customer Portal Login</a></div><div class="item"><a href="/contact/phone-directory">Phone Directory</a></div><div class="item"><a href="/subscribe">Subscribe to Newsletter</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div><div id="navi-dropdown-menu-1060" class="navi-dropdown" style="display: none;"><div class="navi-dropdown-header-l"><!-- //--></div><div class="navi-dropdown-content"><div class="item"><a href="http://www.percona.com/live/mysql-conference-2013/">MySQL Conference &amp; Expo 2013</a></div><div class="item"><a href="http://www.percona.com/live/london-2012/">London 2012</a></div><div class="item"><a href="http://www.percona.com/live/nyc-2012/">New York 2012</a></div><div class="item"><a href="http://www.percona.com/live/mysql-conference-2012/">MySQL Conference &amp; Expo 2012</a></div><div class="item"><a href="/live">Previous Percona Live Events</a></div></div><div class="navi-dropdown-footer"><!-- //--></div></div>  <div class="search-dropdown" id="search-dropdown" style="display: none;">
     <div class="search-dropdown-header"><!-- //--></div>
     <div class="search-dropdown-content">
       <div class="search-info">Search Percona.com:</div>
-      <form method="get" action="http://search.percona.com/search/" id="search-form">
-        <div class="form"><input type="text" id="search-input" name="q" maxlength="100"></div>
+      <form id="search-form" action="http://search.percona.com/search/" method="get">
+        <div class="form"><input type="text" maxlength="100" name="q" id="search-input"></div>
       </form>
     </div>
     <div class="search-dropdown-footer"><!-- //--></div>
@@ -346,11 +343,12 @@
 <!-- /GA //-->
 <!-- NAVI //-->
 <script type="text/javascript">//<![CDATA[
-var navi = [{id:"menu-914", direction: "l"},{id:"menu-915", direction: "l"},{id:"menu-916", direction: "l"},{id:"menu-918", direction: "l"},{id:"menu-919", direction: "l"},{id:"menu-920", direction: "l"},{id:"menu-1060", direction: "l"}];
+var navi = [{id:"menu-914", direction: "l"},{id:"menu-915", direction: "l"},{id:"menu-1125", direction: "l"},{id:"menu-918", direction: "l"},{id:"menu-919", direction: "l"},{id:"menu-1129", direction: "l"},{id:"menu-920", direction: "l"},{id:"menu-1060", direction: "l"}];
 for(var i = 0, c = navi.length; i < c; i++) {
-window.jQuery('#navilink-a-' + navi[i].id).bind('mouseover',{id: navi[i].id, direction:navi[i].direction}, function(e) { NAVI.Open(e.data.id, e.data.direction); } );
+  window.jQuery('#navilink-a-' + navi[i].id).bind('mouseover',{id: navi[i].id, direction:navi[i].direction}, function(e) { NAVI.Open(e.data.id, e.data.direction); } );
 }
 window.jQuery('#search-form').bind('submit', function() { window.location.href = jQuery('#search-form').attr('action') + jQuery('#search-input').val(); return false; });
+
 //]]></script>
 <!-- /NAVI //-->
 <script type="text/javascript">

=== modified file 'doc/source/percona-theme/static/percona.com.css'
--- doc/source/percona-theme/static/percona.com.css	2012-07-13 10:36:41 +0000
+++ doc/source/percona-theme/static/percona.com.css	2013-01-17 15:19:26 +0000
@@ -103,7 +103,7 @@
 	float:left;
 	overflow:hidden;
 	padding:20px 0;
-	width:240px;
+	width:220px;
 	zoom:1
 }
 
@@ -112,7 +112,7 @@
         overflow: hidden;
         zoom: 1;
         float: left;
-        width: 240px;
+        width: 220px;
         padding: 20px 0px;
 }
 
@@ -121,7 +121,7 @@
         overflow: hidden;
         zoom: 1;
         float: left;
-        width: 720px;
+        width: 740px;
         height: 35px;
         padding: 30px 0px;
 }

=== modified file 'doc/source/xtrabackup_bin/choosing_binary.rst'
--- doc/source/xtrabackup_bin/choosing_binary.rst	2012-11-14 00:38:54 +0000
+++ doc/source/xtrabackup_bin/choosing_binary.rst	2013-01-17 15:19:26 +0000
@@ -13,6 +13,12 @@
 ==============================  ===================
 MySQL 5.1.*                     ``xtrabackup_51``
 MySQL 5.1.* with InnoDB plugin  ``xtrabackup``
-Percona Server 5.1 and 5.5      ``xtrabackup``
 MySQL 5.5.*                     ``xtrabackup_55``
+MariaDB 5.1.* 					``xtrabackup``
+MariaDB 5.2.* 					``xtrabackup``
+MariaDB 5.3.* 					``xtrabackup``
+MariaDB 5.5.* 					``xtrabackup_55``
+Percona Server 5.0		        ``xtrabackup_51``
+Percona Server 5.1		        ``xtrabackup``
+Percona Server 5.5  		    ``xtrabackup_55``
 ==============================  ===================

=== modified file 'doc/source/xtrabackup_bin/incremental_backups.rst'
--- doc/source/xtrabackup_bin/incremental_backups.rst	2011-07-07 05:32:50 +0000
+++ doc/source/xtrabackup_bin/incremental_backups.rst	2013-01-17 15:19:26 +0000
@@ -84,7 +84,11 @@
 
 Preparing the second incremental backup is a similar process: apply the deltas to the (modified) base backup, and you will roll its data forward in time to the point of the second incremental backup: ::
 
-  xtrabackup --prepare --apply-log-only --target-dir=/data/backups/base \
+  xtrabackup --prepare --target-dir=/data/backups/base \
   --incremental-dir=/data/backups/inc2
 
+.. note::
+ 
+ :option:`--apply-log-only` should be used when merging all incrementals except the last one. That's why the previous line doesn't contain the :option:`--apply-log-only` option. Even if the :option:`--apply-log-only` was used on the last step, backup would still be consistent but in that case server would perform the rollback phase.
+
 If you wish to avoid the notice that |InnoDB| was not shut down normally, when you have applied the desired deltas to the base backup, you can run :option:`--prepare` again without disabling the rollback phase.

=== modified file 'innobackupex'
--- innobackupex	2013-01-15 06:14:23 +0000
+++ innobackupex	2013-01-17 15:19:26 +0000
@@ -2529,7 +2529,9 @@
 #  MariaDB 5.1.* - xtrabackup
 #  MariaDB 5.2.* - xtrabackup
 #  MariaDB 5.3.* - xtrabackup
-#  Percona Server >= 11.0 - xtrabackup
+#  Percona Server 5.0 - xtrabackup_51
+#  Percona Server 5.1 - xtrabackup
+#  Percona Server 5.5 - xtrabackup_55
 #  MySQL 5.5.* - xtrabackup_55
 #  MariaDB 5.5.* - xtrabackup_55
 
@@ -2809,7 +2811,7 @@
 
 =item --no-lock
 
-Use this option to disable table lock with "FLUSH TABLES WITH READ LOCK". Use it only if ALL your tables are InnoDB and you DO NOT CARE about the binary log position of the backup.
+Use this option to disable table lock with "FLUSH TABLES WITH READ LOCK". Use it only if ALL your tables are InnoDB and you DO NOT CARE about the binary log position of the backup. This option shouldn't be used if there are any DDL statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the mysql database), otherwise it could lead to an inconsistent backup. If you are considering to use --no-lock because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using --safe-slave-backup to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using this option.
 
 =item --no-timestamp
 
@@ -2830,7 +2832,7 @@
 
 =item --redo-only
 
-This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 
+This option should be used when preparing the base full backup and when merging all incrementals except the last one. This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 
 
 =item --rsync