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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/how-tos.rst'
--- doc/source/how-tos.rst	2012-08-01 05:53:54 +0000
+++ doc/source/how-tos.rst	2012-09-19 13:44:36 +0000
@@ -14,6 +14,7 @@
    howtos/recipes_ibkx_stream
    howtos/recipes_ibkx_inc
    howtos/recipes_ibkx_compressed
+   howtos/recipes_ibkx_partition
 
 
 .. _recipes-xbk:

=== added file 'doc/source/howtos/recipes_ibkx_partition.rst'
--- doc/source/howtos/recipes_ibkx_partition.rst	1970-01-01 00:00:00 +0000
+++ doc/source/howtos/recipes_ibkx_partition.rst	2012-09-19 13:44:36 +0000
@@ -0,0 +1,105 @@
+================================================
+ Backing Up and Restoring Individual Partitions
+================================================
+
+|XtraBackup| features :doc:`partial backups <../innobackupex/partial_backups_innobackupex>`, which means that you may backup individual partitions as well because from the storage engines perspective partitions are regular tables with specially formatted names. The only requirement for this feature is having the :term:`innodb_file_per_table` option enabled in the server.
+
+There is only one caveat about using this kind of backup: you can't copy back the prepared backup. Restoring partial backups should be done by importing the tables, and not by using the traditional :option:`--copy-back` option. Although there are some scenarios where restoring can be done by copying back the files, this may be lead to database inconsistencies in many cases and it is not the recommended way to do it.
+
+Creating the backup
+=====================
+
+There are three ways of specifying which part of the whole data will be backed up: regular expressions (:option:`--include`), enumerating the tables in a file (:option:`--tables-file`) or providing a list of databases (:option:`--databases`). In this example  :option:`--include` option will be used.
+
+The regular expression provided to this option will be matched against the fully qualified tablename, including the database name, in the form ``databasename.tablename``.
+
+For example, this will back up the partition ``p4`` from the table ``name`` located in the database ``imdb``::
+
+  $ innobackupex --include='^imdb[.]name#P#p4' /mnt/backup/
+
+This will create a timestamped directory with the usual files that |innobackupex| creates,  but only the data files related to the tables matched.
+
+Output of the |innobackupex| will list the skipped tables :: 
+  
+  ...
+  [01] Skipping ./imdb/person_info.ibd
+  [01] Skipping ./imdb/name#P#p5.ibd
+  [01] Skipping ./imdb/name#P#p6.ibd
+  ...
+  imdb.person_info.frm is skipped because it does not match ^imdb[.]name#P#p4.
+  imdb.title.frm is skipped because it does not match ^imdb[.]name#P#p4.
+  imdb.company_type.frm is skipped because it does not match ^imdb[.]name#P#p4.
+  ... 
+
+Note that this option is passed to :option:`xtrabackup --tables` and is matched against each table of each database, the directories of each database will be created even if they are empty.
+
+Preparing the backup
+=====================
+
+For preparing partial backups, the procedure is analogous to :doc:`exporting tables <../innobackupex/importing_exporting_tables_ibk>` : apply the logs and use the :option:`--export` option::
+
+  $ innobackupex --apply-log --export /mnt/backup/2012-08-28_10-29-09
+
+You may see warnings in the output about tables that don't exists. This is because |InnoDB|-based engines stores its data dictionary inside the tablespace files besides the :term:`.frm` files. |innobackupex| will use |xtrabackup| to remove the missing tables (those that haven't been selected in the partial backup) from the data dictionary in order to avoid future warnings or errors:: 
+
+  InnoDB: in InnoDB data dictionary has tablespace id 51,
+  InnoDB: but tablespace with that id or name does not exist. It will be removed from data dictionary.
+  120828 10:25:28  InnoDB: Waiting for the background threads to start
+  120828 10:25:29 Percona XtraDB (http://www.percona.com) 1.1.8-20.1 started; log sequence number 10098323731
+  xtrabackup: export option is specified.
+  xtrabackup: export metadata of table 'imdb/name#P#p4' to file `./imdb/name#P#p4.exp` (1 indexes)
+  xtrabackup:     name=PRIMARY, id.low=73, page=3
+
+You should also see the notification of the creation of a file needed for importing (:term:`.exp` file) for each table included in the partial backup:: 
+
+  xtrabackup: export option is specified.
+  xtrabackup: export metadata of table 'imdb/name#P#p4' to file `./imdb/name#P#p4.exp` (1 indexes)
+  xtrabackup:     name=PRIMARY, id.low=73, page=3
+
+Note that you can use the :option:`--export` option with :option:`--apply-log` to an already-prepared backup in order to create the :term:`.exp` files.
+
+Finally, check the for the confirmation message in the output:: 
+
+  120828 19:25:38  innobackupex: completed OK!
+
+Restoring from the backups
+==========================
+
+Restoring should be done by :doc:`importing the tables <../innobackupex/importing_exporting_tables_ibk>` in the partial backup to the server. 
+
+.. note::
+ Improved table/partition import is only available in |Percona Server|, this means that partitions which were backed up from different server can be imported as well. For |MySQL| only partitions from that server can be imported with some important limitations. There should be no DROP/CREATE/TRUNCATE/ALTER TABLE commands issued between taking the backup and importing the partition.
+
+First step is to create new table in which data will be restored :: 
+
+  mysql> CREATE TABLE `name_p4` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text NOT NULL,
+  `imdb_index` varchar(12) DEFAULT NULL,
+  `imdb_id` int(11) DEFAULT NULL,
+  `name_pcode_cf` varchar(5) DEFAULT NULL,
+  `name_pcode_nf` varchar(5) DEFAULT NULL,
+  `surname_pcode` varchar(5) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+  ) ENGINE=InnoDB AUTO_INCREMENT=2812744 DEFAULT CHARSET=utf8
+
+To restore the partition from the backup tablespace needs to be discarded for that table: :: 
+
+  mysql>  ALTER TABLE name_p4 DISCARD TABLESPACE;
+
+Next step is to copy the :term:`.exp` and `ibd` files from the backup to |MySQL| data directory: :: 
+
+  $ cp /mnt/backup/2012-08-28_10-29-09/imdb/name#P#p4.exp /var/lib/mysql/imdb/name_p4.exp
+  $ cp /mnt/backup/2012-08-28_10-29-09/imdb/name#P#p4.ibd /var/lib/mysql/imdb/name_p4.ibd
+ 
+.. note::
+ Make sure that the copied files can be accessed by the user running the |MySQL|.
+
+If you're running the |Percona Server| make sure that variable `innodb_import_table_from_xtrabackup` is enabled: :: 
+
+  mysql> SET GLOBAL innodb_import_table_from_xtrabackup=1;
+
+Last step is to import the tablespace: ::
+
+  mysql>  ALTER TABLE name_p4 IMPORT TABLESPACE;
+

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2012-09-07 13:20:26 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2012-09-19 13:44:36 +0000
@@ -46,7 +46,7 @@
 
 .. option:: --databases=LIST
 
-   This option accepts a string argument that specifies the list of databases that |innobackupex| should back up. The list is of the form ``databasename1[.table_name1] databasename2[.table_name2] ...``. If this option is not specified, all databases containing MyISAM and InnoDB tables will be backed up. Please make sure that :option:`--databases` contains all of the InnoDB databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option :option:`--tables-file`.)
+   This option specifies the list of databases that |innobackupex| should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing |MyISAM| and |InnoDB| tables will be backed up. Please make sure that --databases contains all of the |InnoDB| databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
 
 .. option:: --tables-file
 

=== modified file 'doc/source/innobackupex/partial_backups_innobackupex.rst'
--- doc/source/innobackupex/partial_backups_innobackupex.rst	2011-07-07 05:32:50 +0000
+++ doc/source/innobackupex/partial_backups_innobackupex.rst	2012-09-19 13:44:36 +0000
@@ -2,7 +2,7 @@
  Partial Backups
 =================
 
-|XtraBackup| features partial backups, which means that you may backup only some specific tables or databases. The only requirement for this feature is having the :term:`innodb_file_per_table` option enabled in the server and it has the limitation of not being supported with :doc:`streaming <streaming_backups_innobackupex>`.
+|XtraBackup| features partial backups, which means that you may backup only some specific tables or databases. The only requirement for this feature is having the :term:`innodb_file_per_table` option enabled in the server. 
 
 There is only one caveat about partial backups: do not copy back the prepared backup. Restoring partial backups should be done by importing the tables, not by using the traditional :option:`--copy-back` option. Although there are some scenarios where restoring can be done by copying back the files, this may be lead to database inconsistencies in many cases and it is not the recommended way to do it.
 
@@ -50,6 +50,10 @@
 
 will create a timestamped directory with the usual files that |innobackupex| creates, but only containing the data-files related to ``mytable`` in the ``mydatabase`` directory and the ``mysql`` directory with the entire ``mysql`` database.
 
+.. note:: 
+ 
+ Currently in XtraBackup the --databases option has no effect for InnoDB files for both local and streaming backups, i.e. all InnoDB files are always backed up. Currently, only .frm and non-InnoDB tables are limited by that option.
+
 Preparing Partial Backups
 =========================
 

=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2012-04-21 07:12:28 +0000
+++ doc/source/installation/apt_repo.rst	2012-09-19 13:44:36 +0000
@@ -31,14 +31,14 @@
 Debian
 ------
 
- * 6.0 squeeze
+ * 6.0 (squeeze)
 
 Ubuntu
 ------
 
- * 10.04LTS lucid
- * 11.04 natty
- * 11.10 oneiric
+ * 10.04LTS (lucid)
+ * 11.10 (oneiric)
+ * 12.04LTS (precise) 
 
 Experimental Repository
 =======================

=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2012-08-03 12:12:02 +0000
+++ doc/source/percona-theme/layout.html	2012-09-19 13:44:36 +0000
@@ -94,7 +94,7 @@
             {#- old style sidebars: using blocks -- should be deprecated #}
 			            {%- block serverseries %}
 		<div class="side-column-block">
-			<h3>Percona Server Series</h3>
+			<h3>Percona XtraBackup Series</h3>
 			     <ul><li><a href="http://www.percona.com/doc/percona-xtrabackup/1.6/">Percona XtraBackup 1.6</a></li><li><a href="http://www.percona.com/doc/percona-xtrabackup/2.0/">Percona XtraBackup 2.0</a></li></ul>
 			</div>
 			            {%- endblock %}
@@ -214,13 +214,11 @@
       <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-about-us" ><a id="navilink-a-about-us" href="/about-us/">About Us</a></span><span id="navilink-span-mysql-consulting" ><a id="navilink-a-mysql-consulting" href="/mysql-consulting/">Consulting</a></span><span id="navilink-span-support" ><a id="navilink-a-support" href="/mysql-support/">Support</a></span><span id="navilink-span-training" ><a id="navilink-a-training" href="/training/">Training</a></span><span id="navilink-span-development" ><a id="navilink-a-development" href="/development/">Development</a></span><span id="navilink-span-software" ><a id="navilink-a-software" href="/software/">Software</a></span><span id="navilink-span-events" ><a id="navilink-a-events" href="/live/">Events</a></span><span id="navilink-span-contact" ><a id="navilink-a-contact" href="/contact/">Contact Us</a></span>      
-		</div></div>
+		<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 class="inv"><![CDATA[</noindex>]]></span>
+	    </div>
+  	</div></div><!-- /.header /#header -->
 
-		<span class="inv"><![CDATA[</noindex>]]></span>
-      <span class="inv"><![CDATA[</noindex>]]></span>
-    </div>
-  </div></div>
 	<div id="stripe"></div>
 
 {% endblock %}
@@ -329,39 +327,11 @@
 {%- endblock %}
 <span class="inv"><!--[CDATA[<noindex-->]]&gt;</span>
 <div id="submenus">
-	<div class="navi-dropdown" id="navi-dropdown-about-us">
-    <div class="navi-dropdown-header-l"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/about-us/our-mission/">Our Mission</a></div><div class="item"><a href="/about-us/why-percona/">Why Percona?</a></div><div class="item"><a href="/about-us/procedures/">Coordinating with Percona</a></div><div class="item"><a href="/about-us/customers/">Customers</a></div><div class="item"><a href="/webinars/">Webinars</a></div><div class="item"><a href="/about-us/mysql-case-studies/">MySQL Case Studies</a></div><div class="item"><a href="/about-us/our-team/">Our Team</a></div><div class="item"><a href="/about-us/books/">Our Books</a></div><div class="item"><a href="/about-us/blogs/">Our Blogs</a></div><div class="item"><a href="/about-us/mysql-white-papers/">MySQL White Papers</a></div><div class="item"><a href="/about-us/conferences/">Conferences</a></div><div class="item"><a href="/about-us/presentations/">Presentations</a></div><div class="item"><a href="/about-us/newsletters/">Newsletters</a></div><div class="item"><a href="/about-us/pressreleases/">Press Releases</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-mysql-consulting">
-    <div class="navi-dropdown-header-l"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/mysql-consulting/overview/">MySQL Consulting Overview</a></div><div class="item"><a href="/mysql-consulting/prices/">MySQL Consulting Prices</a></div><div class="item"><a href="/mysql-consulting/architecture/">MySQL Architecture &amp; Design</a></div><div class="item"><a href="/mysql-consulting/mysql-backups/">MySQL Backups</a></div><div class="item"><a href="/mysql-consulting/cloud-computing/">MySQL Cloud Solutions</a></div><div class="item"><a href="/mysql-consulting/cluster/">MySQL Cluster Consulting</a></div><div class="item"><a href="/mysql-consulting/data-warehousing/">MySQL Data Warehousing</a></div><div class="item"><a href="/mysql-consulting/data-recovery/">MySQL Data Recovery</a></div><div class="item"><a href="/mysql-consulting/high-availability/">MySQL High Availability</a></div><div class="item"><a href="/mysql-consulting/mysql-monitoring-graphing/">MySQL Monitoring &amp; Graphing</a></div><div class="item"><a href="/mysql-consulting/mysql-onsite-consulting/">MySQL Onsite Consulting</a></div><div class="item"><a href="/mysql-consulting/performance-audit/">MySQL Performance Audit</a></div><div class="item"><a href="/mysql-consulting/remote-dba/">MySQL Remote DBA</a></div><div class="item"><a href="/mysql-consulting/mysql-replication/">MySQL Replication</a></div><div class="item"><a href="/mysql-consulting/upgrade/">MySQL Version Upgrades</a></div><div class="item"><a href="/mysql-consulting/24x7-emergency/">Emergency 24&times;7 Consulting</a></div><div class="item"><a href="/mysql-consulting/migration/">Migration to MySQL</a></div><div class="item"><a href="/drizzle-consulting/">Drizzle Consulting</a></div><div class="item"><a href="/mysql-consulting/sphinx/">Sphinx Consulting</a></div><div class="item"><a href="/mysql-consulting/drbd/">DRBD Consulting</a></div><div class="item"><a href="/mysql-consulting/memcached/">Memcached Consulting</a></div><div class="item"><a href="/mysql-consulting/other-services/">Other Consulting Services</a></div>    </div>
-    <div class="navi-dropdown-footer"><!-- //--></div>
-  </div><div class="navi-dropdown" id="navi-dropdown-support">
-    <div class="navi-dropdown-header-l"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/mysql-support/">MySQL Support Overview</a></div><div class="item"><a href="/prices/mysql-support/">MySQL Support Prices</a></div><div class="item"><a href="/mysql-support/policies/">MySQL Support Policies</a></div><div class="item"><a href="/mysql-support/consulting-vs-support/">Consulting vs. Support</a></div><div class="item"><a href="https://customers.percona.com">Customer Portal Login</a></div>    </div>
-    <div class="navi-dropdown-footer"><!-- //--></div>
-  </div><div class="navi-dropdown" id="navi-dropdown-training">
-    <div class="navi-dropdown-header-l"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/training/">MySQL Training Overview</a></div><div class="item"><a href="/prices/training/">MySQL Training Prices</a></div><div class="item"><a href="/training/classes/dba/">MySQL DBA Training</a></div><div class="item"><a href="/training/classes/developers/">MySQL Developer Training</a></div><div class="item"><a href="/training/classes/operations/">MySQL Operations Training</a></div><div class="item"><a href="/training/classes/innodb/">InnoDB &amp; XtraDB Training</a></div><div class="item"><a href="/training/classes/custom-onsite/">Custom Onsite Training</a></div><div class="item"><a href="http://store.percona.com/catalog.php?category=8">Live Virtual Training</a></div>    </div>
-    <div class="navi-dropdown-footer"><!-- //--></div>
-  </div><div class="navi-dropdown" id="navi-dropdown-development">
-    <div class="navi-dropdown-header-l"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/development/mysql/">MySQL Development Overview</a></div><div class="item"><a href="/development/prices/">Custom Development Prices</a></div><div class="item"><a href="/development/maintenance/">MySQL Support Overview</a></div><div class="item"><a href="/development/benchmarking/">Custom Product Evaluation</a></div><div class="item"><a href="/development/maatkit/">Custom Maatkit Development</a></div><div class="item"><a href="/development/custom-tools/">Custom Tools Development</a></div>    </div>
-    <div class="navi-dropdown-footer"><!-- //--></div>
-  </div><div class="navi-dropdown" id="navi-dropdown-software">
-    <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-xtrabackup/">Percona XtraBackup</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-xtradb/">Percona XtraDB</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="/prices/software/">Software Prices</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 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-events">
-    <div class="navi-dropdown-header-r"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/live/nyc-2012/">New York 2012</a></div><div class="item"><a href="/live/london-2012/">London 2012</a></div><div class="item"><a href="/live/mysql-conference-2013/">MySQL Conference &amp; Expo 2013</a></div><div class="item"><a href="/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="navi-dropdown" id="navi-dropdown-contact">
-    <div class="navi-dropdown-header-r"><!-- //--></div>
-    <div class="navi-dropdown-content"><div class="item"><a href="/contact/24x7-emergency/">24&times;7 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-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 class="search-dropdown-header"><!-- //--></div>
     <div class="search-dropdown-content">
@@ -383,7 +353,7 @@
 <!-- /GA //-->
 <!-- NAVI //-->
 <script type="text/javascript">//<![CDATA[
-var navi = [{id:"about-us", direction: "l"},{id:"mysql-consulting", direction: "l"},{id:"support", direction: "l"},{id:"training", direction: "l"},{id:"development", direction: "l"},{id:"software", direction: "l"},{id:"events", direction: "r"},{id:"contact", direction: "r"}];
+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"}];
 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); } );
 }

=== modified file 'doc/source/release-notes.rst'
--- doc/source/release-notes.rst	2012-08-03 12:12:02 +0000
+++ doc/source/release-notes.rst	2012-09-19 13:44:36 +0000
@@ -2,24 +2,6 @@
  |Percona| |XtraBackup| Release Notes
 ======================================
 
-Percona |XtraBackup| 2.0 
-=========================
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   release-notes/2.0/*
-
-Percona |XtraBackup| 1.6 
-=========================
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   release-notes/1.6/*
-
 Older releases
 ==============
 
@@ -27,9 +9,25 @@
    :maxdepth: 1
    :glob:
 
+   release-notes/1.3
+   release-notes/1.4
    release-notes/1.5
-   release-notes/1.4
-   release-notes/1.3
-
-
+
+Percona |XtraBackup| 1.6 
+=========================
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   release-notes/1.6/*
+
+Percona |XtraBackup| 2.0 
+=========================
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   release-notes/2.0/*
 

=== modified file 'innobackupex'
--- innobackupex	2012-09-07 13:20:26 +0000
+++ innobackupex	2012-09-19 13:44:36 +0000
@@ -2627,7 +2627,7 @@
 
 =item --databases=LIST
 
-This option specifies the list of databases that innobackupex should back up.  The option accepts a string argument. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing MyISAM and InnoDB tables will be backed up. Please make sure that --databases contains all of the InnoDB databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
+This option specifies the list of databases that innobackupex should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing MyISAM and InnoDB tables will be backed up.  Please make sure that --databases contains all of the InnoDB databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
 
 =item --defaults-file=[MY.CNF]