Merge lp:~vlad-lesin/percona-xtrabackup/2.1-apply-archived-logs-innodb5.6 into lp:percona-xtrabackup/2.1

[Vlad Lesin]

This is implementation of ability to apply archived logs in xtrabackup which is described here: https://blueprints.launchpad.net/percona-xtrabackup/+spec/log-archiving-restore
See commit comment for more detailed description.

[Laurynas Biveinis (laurynas-biveinis)]

A merge conflict, unless spurious, that needs rebasing on the current trunk?

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> A merge conflict, unless spurious, that needs rebasing on the current trunk?
I have just rebased it on the current trunk.

[Alexey Kopytov (akopytov)]

Vlad,

    - I don't think the XtraBackup part should pull the entire server
      implementation of log archiving. It looks like only a minor part
      of it should be applied to InnoDB 5.6 code base to be able to
      parse and apply archived logs? As in, do we really need
      fil_space_contains_node(), log_sys->archive_buf initialization,
      changes to log_checkpoint_set_nth_group_info(), etc.?

    - can you clarify the following change? I.e. under what
      circumstances exactly can a tablespace exist when we are trying
      to replay MLOG_FILE_CREATE from the archived logs?

+@@ -3325,9 +3341,13 @@
+ path = fil_make_ibd_name(tablename, false);
+ }
+
++ /* The files can already exist in the case of archived logs applying */
+ file = os_file_create(
+ innodb_file_data_key, path,
+- OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
++ (srv_archive_recovery ?
++ OS_FILE_OVERWRITE :
++ OS_FILE_CREATE) |
++ OS_FILE_ON_ERROR_NO_EXIT,
+ OS_FILE_NORMAL,
+ OS_DATA_FILE,
+ &ret);

    - s/alligned to the up of log file block/aligned up to the log block size/

    - please clarify why the following change is needed. As I
      understand, we don't start the FTS optimize thread in
      XtraBackup. That code is also missing block braces and is using
      spaces instead of tabs for indentation:

+@@ -3032,7 +3032,8 @@
+
+ ib_logf(IB_LOG_LEVEL_INFO, "FTS optimize thread exiting.");
+
+- os_event_set(exit_event);
++ if (exit_event)
++ os_event_set(exit_event);
+
+ /* We count the number of threads in os_thread_exit(). A created
+ thread should always use that to exit and not use return() to exit. */
+

    - please use LSN_PF instead of "%llu"

    - in recv_recovery_from_archive_start() we ignore the first_log_no
      argument and use xtrabackup_arch_first_file_lsn instead. wouldn't
      it be better to pass xtrabackup_arch_first_file_lsn as the
      first_log_no argument to recv_recovery_from_archive_start() and
      get rid of min/max_arch_log_no in
      innobase_start_or_create_for_mysql()?

    - in xb_data_files_init() the patch replaces min/max_flushed_lsn
      declarations with min/max_arch_log_no. Which are not really
      used. but then the call still calls open_or_create_data_files()
      with the (now non-existing) flushed_lsn variables?

    - s/xtrabackup: Note: opening archived log directory %s was
      failed/xtrabackup: error: cannot open archived log directory %s/

    - replace the strstr() call in xtrabackup_arch_search_files() with
      strncmp()

    - xtrabackup_arch_search_files() is declared to return bool, but
      returns xtrabackup_arch_first_file_lsn?

    - we tend to use the InnoDB code style in xtrabackup.cc. In
      particular, the opening brace must be on the same line as the
      'if' statement. And braces should be used even for
      single-statement 'if' blocks;

    - s/trunsactions/transactions/

    - s/undid/rolled back/

    - the check for Percona Server 5.6 doesn't work (try starting it
      with an upstream 5.6 server). The reason is that the syntax for
      string equality comparison is "val1 = val2", not "val1=val2"

    - the test case doesn't wo...

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Vlad,

Why don't we use --log-arch-dir option (with same name as server one) instead of --archived-logs-dir?

[Vlad Lesin (vlad-lesin)]

On 05/06/2013 06:21 PM, Sergei Glushchenko wrote:
> Vlad,
>
> Why don't we use --log-arch-dir option (with same name as server one) instead of --archived-logs-dir?
>

This is good idea, thanks.

--
Vlad Lesin, Software Engineer, Percona Inc.
<email address hidden>
skype: vlad_lesin
JID: <email address hidden>
ICQ: 204036003
phone: [phone]
Tula, Russia (GMT +4)

[Vlad Lesin (vlad-lesin)]

On 05/01/2013 02:40 PM, Alexey Kopytov wrote:
> - I don't think the XtraBackup part should pull the entire server
> implementation of log archiving. It looks like only a minor part
> of it should be applied to InnoDB 5.6 code base to be able to
> parse and apply archived logs? As in, do we really need
> fil_space_contains_node(), log_sys->archive_buf initialization,
> changes to log_checkpoint_set_nth_group_info(), etc.?

Done.

> - can you clarify the following change? I.e. under what
> circumstances exactly can a tablespace exist when we are trying
> to replay MLOG_FILE_CREATE from the archived logs?

Yes. It can be for example in the case when this file did not exist at
the beginning of backup process and was created somewhere in the middle
of backup process. So log file contains "create" command as backup
process started tracking it before the file creation, but data directory
contains this file as it was copied from original directory. I copied
this explanation to code comment.

> +@@ -3325,9 +3341,13 @@
> + path = fil_make_ibd_name(tablename, false);
> + }
> +
> ++ /* The files can already exist in the case of archived logs applying */
> + file = os_file_create(
> + innodb_file_data_key, path,
> +- OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
> ++ (srv_archive_recovery ?
> ++ OS_FILE_OVERWRITE :
> ++ OS_FILE_CREATE) |
> ++ OS_FILE_ON_ERROR_NO_EXIT,
> + OS_FILE_NORMAL,
> + OS_DATA_FILE,
> + &ret);
>
> - s/alligned to the up of log file block/aligned up to the log block size/

Done.

> - please clarify why the following change is needed. As I
> understand, we don't start the FTS optimize thread in
> XtraBackup. That code is also missing block braces and is using
> spaces instead of tabs for indentation:
>
> +@@ -3032,7 +3032,8 @@
> +
> + ib_logf(IB_LOG_LEVEL_INFO, "FTS optimize thread exiting.");
> +
> +- os_event_set(exit_event);
> ++ if (exit_event)
> ++ os_event_set(exit_event);
> +
> + /* We count the number of threads in os_thread_exit(). A created
> + thread should always use that to exit and not use return() to exit. */
> +

I fixed using spaces instead tabs for indentation and missing braces.

As I understuud FTS optimize thread is started in xtrabackup because I
have the following backtrace in the case of missing exit_event condition:
56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0 0x00007ffff633f037 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:56
#1 0x00007ffff6342698 in __GI_abort () at abort.c:90
#2 0x000000000063ac80 in os_event_set (event=0x0)
     at
/home/vlesin/src/work/percona-xtrabackup-2.1-arch-log/mysql-5.6/storage/innobase/os/os0sync.cc:437
#3 0x00000000006063ec in fts_optimize_thread (arg=0x1e604e8)
     at
/home/vlesin/src/work/percona-xtrabackup-2.1-arch-log/mysql-5.6/storage/innobase/fts/fts0opt.cc:3036
#4 0x00007ffff79bcf8e in start_thread (arg=0x7fffd57fa700) at
pthread_create.c:311
#5 0x00007ffff6401e1d in clone () at
../sysdeps/unix/sysv/linux/x86_64/clone.S:113

Here is the backtrace of FTS initializati...

[Vlad Lesin (vlad-lesin)]

On 05/06/2013 06:21 PM, Sergei Glushchenko wrote:
> Vlad,
>
> Why don't we use --log-arch-dir option (with same name as server one) instead of --archived-logs-dir?
>

Done.

--
Vlad Lesin, Software Engineer, Percona Inc.
<email address hidden>
skype: vlad_lesin
JID: <email address hidden>
ICQ: 204036003
phone: [phone]
Tula, Russia (GMT +4)

[Alexey Kopytov (akopytov)]

Hi Vlad,

General comments:

     - I think this MP should wait until 5.6.11-60.3 with the fix for bug
       #1172591 is released. Then the test suite should use 5.6.11-60.30
       for testing instead of the custom build

     - there should be a separate fix for bug #1177182 for both 2.0 and
2.1, and again, this branch should be rebased once the fix is merged to
trunks.

     - xtrabackup_arch_search_files() should use msg() instead of
       fprintf(stderr,...)

Other comments/questions:

On Fri, 10 May 2013 09:42:06 +0400, Vlad Lesin wrote:
>> - can you clarify the following change? I.e. under what
>> circumstances exactly can a tablespace exist when we are trying
>> to replay MLOG_FILE_CREATE from the archived logs?
>
> Yes. It can be for example in the case when this file did not exist at
> the beginning of backup process and was created somewhere in the middle
> of backup process. So log file contains "create" command as backup
> process started tracking it before the file creation, but data directory
> contains this file as it was copied from original directory. I copied
> this explanation to code comment.
>

If a tablespace exists on recovery, it is created into fil_system before
the recovery starts. When replaying MLOG_FILE_CREATE,
fil_op_log_parse_or_replay first checks if the tablespace exists in
fil_system and does nothing. So I still don't understand that change in
fil_create_new_single_table_tablespace().

>
>> +@@ -3325,9 +3341,13 @@
>> + path = fil_make_ibd_name(tablename, false);
>> + }
>> +
>> ++ /* The files can already exist in the case of archived logs
>> applying */
>> + file = os_file_create(
>> + innodb_file_data_key, path,
>> +- OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
>> ++ (srv_archive_recovery ?
>> ++ OS_FILE_OVERWRITE :
>> ++ OS_FILE_CREATE) |
>> ++ OS_FILE_ON_ERROR_NO_EXIT,
>> + OS_FILE_NORMAL,
>> + OS_DATA_FILE,
>> + &ret);
>>
>> - s/alligned to the up of log file block/aligned up to the log
>> block size/
>
> Done.
>

Not fully done, it is "aligned" (single "l"), not "alligned".

>> - please clarify why the following change is needed. As I
>> understand, we don't start the FTS optimize thread in
>> XtraBackup. That code is also missing block braces and is using
>> spaces instead of tabs for indentation:
>>
>> +@@ -3032,7 +3032,8 @@
>> +
>> + ib_logf(IB_LOG_LEVEL_INFO, "FTS optimize thread exiting.");
>> +
>> +- os_event_set(exit_event);
>> ++ if (exit_event)
>> ++ os_event_set(exit_event);
>> +
>> + /* We count the number of threads in os_thread_exit(). A created
>> + thread should always use that to exit and not use return() to
>> exit. */
>> +
>
> I fixed using spaces instead tabs for indentation and missing braces.
>
> As I understuud FTS optimize thread is started in xtrabackup because I
>

OK, I see the problem now, reported as bug #1179193. This means we have
to fix that bug separately in both 2.0 and 2.1, and then rebase this
branch on 2.1 trunk with that fix included.

>> - please use LSN_PF instead of "%llu"
>
...

[Vlad Lesin (vlad-lesin)]

On 05/12/2013 04:48 PM, Alexey Kopytov wrote:
>>> - in recv_recovery_from_archive_start() we ignore the first_log_no
>>> argument and use xtrabackup_arch_first_file_lsn instead. wouldn't
>>> it be better to pass xtrabackup_arch_first_file_lsn as the
>>> first_log_no argument to recv_recovery_from_archive_start() and

As I understood our chat right the main cause of this change is to
remove 'fake' arguments from recv_recovery_from_archive_start().

Why just don't remove first_log_no from
recv_recovery_from_archive_start() arguments list? I don't see any
benefits in passing xtrabackup_arch_first_file_lsn and
xtrabackup_arch_last_file_lsn to recv_recovery_from_archive_start() as
arguments because in this case we just remove using global external
variables from recv_recovery_from_archive_start() to
innobase_start_or_create_for_mysql().

 >>> get rid of min/max_arch_log_no in
 >>> innobase_start_or_create_for_mysql()?

Right. In this case we could remove min/max_arch_log_no from
open_or_create_data_files() arguments list and from xb_data_files_init()
too.

--
Vlad Lesin, Software Engineer, Percona Inc.
<email address hidden>
skype: vlad_lesin
JID: <email address hidden>
ICQ: 204036003
phone: [phone]
Tula, Russia (GMT +4)

[Vlad Lesin (vlad-lesin)]

On 05/12/2013 04:48 PM, Alexey Kopytov wrote:

>
> I tried to repeat the test, but your branch doesn't build for me now, it
> fails as follows:
>
> [ 70%] Building CXX object
> libmysqld/CMakeFiles/sql_embedded.dir/__/sql/field_conv.cc.o
> /Users/kaa/src/launchpad/percona-xtrabackup/2.1-apply-archived-logs-innodb5.6/mysql-5.6/storage/innobase/log/log0recv.cc:3142:3:
> error: no matching function for call to
> 'log_checkpoint_get_nth_group_info'
> log_checkpoint_get_nth_group_info(buf, group->id,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /Users/kaa/src/launchpad/percona-xtrabackup/2.1-apply-archived-logs-innodb5.6/mysql-5.6/storage/innobase/include/log0log.h:286:1:
> note: candidate function not viable: no known
> conversion from 'lsn_t *' (aka 'unsigned long long *') to 'ulint
> *' (aka 'unsigned long *') for 3rd argument;
> log_checkpoint_get_nth_group_info(
> ^
> 1[ 70%] error generated.
>

I am preparing the more detailed answer with code fixes so currently I
don't want to commit unfinished changes. But it is possible just to
comment log_checkpoint_get_nth_group_info() invoking at that place
because the values it reads from buffer are not used for logs applying.

--
Vlad Lesin, Software Engineer, Percona Inc.
<email address hidden>
skype: vlad_lesin
JID: <email address hidden>
ICQ: 204036003
phone: [phone]
Tula, Russia (GMT +4)

[Alexey Kopytov (akopytov)]

Hi Vlad,

On Mon, 13 May 2013 17:44:36 +0400, Vlad Lesin wrote:
> On 05/12/2013 04:48 PM, Alexey Kopytov wrote:
>>>> - in recv_recovery_from_archive_start() we ignore the
>>>> first_log_no
>>>> argument and use xtrabackup_arch_first_file_lsn instead.
>>>> wouldn't
>>>> it be better to pass xtrabackup_arch_first_file_lsn as the
>>>> first_log_no argument to recv_recovery_from_archive_start()
>>>> and
>
> As I understood our chat right the main cause of this change is to
> remove 'fake' arguments from recv_recovery_from_archive_start().
>
> Why just don't remove first_log_no from
> recv_recovery_from_archive_start() arguments list? I don't see any
> benefits in passing xtrabackup_arch_first_file_lsn and
> xtrabackup_arch_last_file_lsn to recv_recovery_from_archive_start() as
> arguments because in this case we just remove using global external
> variables from recv_recovery_from_archive_start() to
> innobase_start_or_create_for_mysql().
>

Either way is fine by me as long as we avoid fake arguments.

> >>> get rid of min/max_arch_log_no in
> >>> innobase_start_or_create_for_mysql()?
>
> Right. In this case we could remove min/max_arch_log_no from
> open_or_create_data_files() arguments list and from xb_data_files_init()
> too.
>

OK.

[Vlad Lesin (vlad-lesin)]

> > Why just don't remove first_log_no from
> > recv_recovery_from_archive_start() arguments list? I don't see any
> > benefits in passing xtrabackup_arch_first_file_lsn and
> > xtrabackup_arch_last_file_lsn to recv_recovery_from_archive_start() as
> > arguments because in this case we just remove using global external
> > variables from recv_recovery_from_archive_start() to
> > innobase_start_or_create_for_mysql().
> >
>
> Either way is fine by me as long as we avoid fake arguments.
Done.

> > Right. In this case we could remove min/max_arch_log_no from
> > open_or_create_data_files() arguments list and from xb_data_files_init()
> > too.
> >
>
> OK.
Done.

[Vlad Lesin (vlad-lesin)]

> Hi Vlad,
>
>
> General comments:
>
> - I think this MP should wait until 5.6.11-60.3 with the fix for bug
> #1172591 is released. Then the test suite should use 5.6.11-60.30
> for testing instead of the custom build
The fix is released.

> - there should be a separate fix for bug #1177182 for both 2.0 and
> 2.1, and again, this branch should be rebased once the fix is merged to
> trunks.
The fix for 2.1 is merged and for 2.0 is approved for merging.

> - xtrabackup_arch_search_files() should use msg() instead of
> fprintf(stderr,...)
Fixed.

> >> - s/alligned to the up of log file block/aligned up to the log
> >> block size/
> >
> > Done.
> >
>
> Not fully done, it is "aligned" (single "l"), not "alligned".
Done.

> OK, I see the problem now, reported as bug #1179193. This means we have
> to fix that bug separately in both 2.0 and 2.1, and then rebase this
> branch on 2.1 trunk with that fix included.
I explored this problem more deeply and found out that the problem is "apply archived log" specific. See my comment to the bug report and
                if (srv_apply_log_only) {
                        goto skip_processes;
                }
strings in innobase_start_or_create_for_mysql().

> >> - the test case doesn't work for me (fails with "table 'test.t1'
> >> doesn't exist" when run against PS 5.6 with log archiving enabled)
> >>
> >
> > I need your assistance here because I can't reproduce this on my
> > environment and, as I understood, on Jenkins environment too(see
> > http://jenkins.percona.com/view/XtraBackup/job/percona-
> xtrabackup-2.1-param/298/#showFailuresLink).
> >
>
> I tried to repeat the test, but your branch doesn't build for me now, it
> fails as follows:
>
> [ 70%] Building CXX object
> libmysqld/CMakeFiles/sql_embedded.dir/__/sql/field_conv.cc.o
> /Users/kaa/src/launchpad/percona-xtrabackup/2.1-apply-archived-logs-
> innodb5.6/mysql-5.6/storage/innobase/log/log0recv.cc:3142:3:
> error: no matching function for call to
> 'log_checkpoint_get_nth_group_info'
> log_checkpoint_get_nth_group_info(buf, group->id,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /Users/kaa/src/launchpad/percona-xtrabackup/2.1-apply-archived-logs-
> innodb5.6/mysql-5.6/storage/innobase/include/log0log.h:286:1:
> note: candidate function not viable: no known
> conversion from 'lsn_t *' (aka 'unsigned long long *') to 'ulint
> *' (aka 'unsigned long *') for 3rd argument;
> log_checkpoint_get_nth_group_info(
> ^
> 1[ 70%] error generated.
Fixed. The invocation of log_checkpoint_get_nth_group_info() is commented in this place because there is no need to read archived_file_no and archived_offset. They are calculated another way.

[Vlad Lesin (vlad-lesin)]

Rebased on newest trunk (lp:percona-xtrabackup revision 650).

[Alexey Kopytov (akopytov)]

I don't think XtraDB-related changes in run.sh are necessary now. Check the is_xtradb()/require_xtradb() functions and how they are used in other tests.

[Alexey Kopytov (akopytov)]

Oh, and you will also need require_server_version_higher_than()

[Vlad Lesin (vlad-lesin)]

On 07/31/2013 04:54 PM, Alexey Kopytov wrote:
> I don't think XtraDB-related changes in run.sh are necessary now. Check the is_xtradb()/require_xtradb() functions and how they are used in other tests.
>
Yes, you are right, there is no need to change run.sh as server and
innodb flavours are detected right now based on "innodb_version" server
variable.

But require_server_version_higher_than() and
require_xtradb()/require_xtradb() does not suite me because
require_server_version_higher_than() checks only server version but I
need to check server flavour too as well as
require_xtradb()/require_xtradb() checks only the fact of xtradb using
but xtradb version must be checked too.

So I reverted run.sh and fixed xb_apply_archived_logs.sh to use
is_server_version_higher_than() for server version checking.

[Alexey Kopytov (akopytov)]

Hi Vlad,

On Wed, 31 Jul 2013 21:43:33 -0000, Vlad Lesin wrote:
> But require_server_version_higher_than() and
> require_xtradb()/require_xtradb() does not suite me because
> require_server_version_higher_than() checks only server version but I
> need to check server flavour too as well as
> require_xtradb()/require_xtradb() checks only the fact of xtradb using
> but xtradb version must be checked too.
>

You can do:

require_xtradb
require_server_version_higher_than 5.6.10

Or use is_* functions if you need something complex.

[Vlad Lesin (vlad-lesin)]

On 08/01/2013 08:39 AM, Alexey Kopytov wrote:
> Hi Vlad,
>
> On Wed, 31 Jul 2013 21:43:33 -0000, Vlad Lesin wrote:
>> But require_server_version_higher_than() and
>> require_xtradb()/require_xtradb() does not suite me because
>> require_server_version_higher_than() checks only server version but I
>> need to check server flavour too as well as
>> require_xtradb()/require_xtradb() checks only the fact of xtradb using
>> but xtradb version must be checked too.
>>
>
> You can do:
>
> require_xtradb
> require_server_version_higher_than 5.6.10
>
> Or use is_* functions if you need something complex.
>

Yes, but xtradb can be 5.5,5.1 or 5.6. But only 5.6 supports logs applying.

[Alexey Kopytov (akopytov)]

Hi Vlad,

On Thu, 01 Aug 2013 11:01:56 +0400, Vlad Lesin wrote:
>> You can do:
>>
>> require_xtradb
>> require_server_version_higher_than 5.6.10
>>
>> Or use is_* functions if you need something complex.
>>
>
> Yes, but xtradb can be 5.5,5.1 or 5.6. But only 5.6 supports logs applying.
>

The above 2 lines will make the test run only on XtraDB > 5.6.10?

[Vlad Lesin (vlad-lesin)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/415/ - testing with PS-5.6.11
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/414/ - testing with PS-5.6.12 and statically built openssl

[Alexey Kopytov (akopytov)]

Vlad,

Do you have any explanations for multiple test failures and crashes in both builds?

review: Needs Information

[Vlad Lesin (vlad-lesin)]

> Vlad,
>
> Do you have any explanations for multiple test failures and crashes in both
> builds?

Yes, there were bug concerned with wrong lsn writing to data files on "prepare" step when logs applying is not used. I fixed it, here is the new test results:
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/420/

[Alexey Kopytov (akopytov)]

Vlad,

Approved, but please rebase on the current trunk. I get many conflicts in innodb56.patch. The good news is that it's going to be the last rebase for this branch. Sorry about the stretched review process. Please also do another Jenkins param build after rebasing.

Thanks.

review: Approve

[Vlad Lesin (vlad-lesin)]

> Vlad,
>
> Approved, but please rebase on the current trunk. I get many conflicts in
> innodb56.patch. The good news is that it's going to be the last rebase for
> this branch. Sorry about the stretched review process. Please also do another
> Jenkins param build after rebasing.
>
> Thanks.

Done.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/443/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-08-20 17:43:45 +0000
+++ patches/innodb56.patch	2013-08-26 07:08:27 +0000
@@ -1564,3 +1564,825 @@
  
  	buf = group->checkpoint_buf;
  
+--- a/storage/innobase/fil/fil0fil.cc
++++ b/storage/innobase/fil/fil0fil.cc
+@@ -1980,12 +1980,6 @@
+ 						contain sensible data */
+ 	ulint*		flags,			/*!< out: tablespace flags */
+ 	ulint*		space_id,		/*!< out: tablespace ID */
+-#ifdef UNIV_LOG_ARCHIVE
+-	ulint*		min_arch_log_no,	/*!< out: min of archived
+-						log numbers in data files */
+-	ulint*		max_arch_log_no,	/*!< out: max of archived
+-						log numbers in data files */
+-#endif /* UNIV_LOG_ARCHIVE */
+ 	lsn_t*		min_flushed_lsn,	/*!< out: min of flushed
+ 						lsn values in data files */
+ 	lsn_t*		max_flushed_lsn)	/*!< out: max of flushed
+@@ -2014,10 +2008,6 @@
+ 	if (!one_read_already) {
+ 		*min_flushed_lsn = flushed_lsn;
+ 		*max_flushed_lsn = flushed_lsn;
+-#ifdef UNIV_LOG_ARCHIVE
+-		*min_arch_log_no = arch_log_no;
+-		*max_arch_log_no = arch_log_no;
+-#endif /* UNIV_LOG_ARCHIVE */
+ 		return;
+ 	}
+ 
+@@ -2027,14 +2017,6 @@
+ 	if (*max_flushed_lsn < flushed_lsn) {
+ 		*max_flushed_lsn = flushed_lsn;
+ 	}
+-#ifdef UNIV_LOG_ARCHIVE
+-	if (*min_arch_log_no > arch_log_no) {
+-		*min_arch_log_no = arch_log_no;
+-	}
+-	if (*max_arch_log_no < arch_log_no) {
+-		*max_arch_log_no = arch_log_no;
+-	}
+-#endif /* UNIV_LOG_ARCHIVE */
+ }
+ 
+ /*================ SINGLE-TABLE TABLESPACES ==========================*/
+@@ -3538,9 +3520,6 @@
+ 	lsn_t		lsn;		/*!< Flushed LSN from header page */
+ 	ulint		id;		/*!< Space ID */
+ 	ulint		flags;		/*!< Tablespace flags */
+-#ifdef UNIV_LOG_ARCHIVE
+-	ulint		arch_log_no;	/*!< latest archived log file number */
+-#endif /* UNIV_LOG_ARCHIVE */
+ };
+ 
+ static
+@@ -3771,9 +3750,6 @@
+ 	if (def.success) {
+ 		fil_read_first_page(
+ 			def.file, FALSE, &def.flags, &def.id,
+-#ifdef UNIV_LOG_ARCHIVE
+-			&space_arch_log_no, &space_arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 			&def.lsn, &def.lsn);
+ 
+ 		/* Validate this single-table-tablespace with SYS_TABLES,
+@@ -3795,9 +3771,6 @@
+ 	if (remote.success) {
+ 		fil_read_first_page(
+ 			remote.file, FALSE, &remote.flags, &remote.id,
+-#ifdef UNIV_LOG_ARCHIVE
+-			&remote.arch_log_no, &remote.arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 			&remote.lsn, &remote.lsn);
+ 
+ 		/* Validate this single-table-tablespace with SYS_TABLES,
+@@ -3820,9 +3793,6 @@
+ 	if (dict.success) {
+ 		fil_read_first_page(
+ 			dict.file, FALSE, &dict.flags, &dict.id,
+-#ifdef UNIV_LOG_ARCHIVE
+-			&dict.arch_log_no, &dict.arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 			&dict.lsn, &dict.lsn);
+ 
+ 		/* Validate this single-table-tablespace with SYS_TABLES,
+@@ -4054,9 +4024,6 @@
+ {
+ 	fil_read_first_page(
+ 		fsp->file, FALSE, &fsp->flags, &fsp->id,
+-#ifdef UNIV_LOG_ARCHIVE
+-		&fsp->arch_log_no, &fsp->arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 		&fsp->lsn, &fsp->lsn);
+ 
+ 	if (fsp->id == ULINT_UNDEFINED || fsp->id == 0) {
+
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -2859,12 +2859,9 @@
+ 	}
+ 
+ #ifdef UNIV_LOG_ARCHIVE
+-	/* Since innodb_log_arch_dir has no relevance under MySQL,
+-	starting from 4.0.6 we always set it the same as
+-	innodb_log_group_home_dir: */
+-
+-	innobase_log_arch_dir = innobase_log_group_home_dir;
+-
++	if (!innobase_log_arch_dir) {
++		innobase_log_arch_dir = srv_log_group_home_dir;
++	}
+ 	srv_arch_dir = innobase_log_arch_dir;
+ #endif /* UNIG_LOG_ARCHIVE */
+ 
+
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
+@@ -374,12 +374,6 @@
+ 						contain sensible data */
+ 	ulint*		flags,			/*!< out: tablespace flags */
+ 	ulint*		space_id,		/*!< out: tablespace ID */
+-#ifdef UNIV_LOG_ARCHIVE
+-	ulint*		min_arch_log_no,	/*!< out: min of archived
+-						log numbers in data files */
+-	ulint*		max_arch_log_no,	/*!< out: max of archived
+-						log numbers in data files */
+-#endif /* UNIV_LOG_ARCHIVE */
+ 	lsn_t*		min_flushed_lsn,	/*!< out: min of flushed
+ 						lsn values in data files */
+ 	lsn_t*		max_flushed_lsn);	/*!< out: max of flushed
+
+--- a/storage/innobase/include/log0log.h
++++ b/storage/innobase/include/log0log.h
+@@ -70,6 +70,10 @@
+ /** Maximum number of log groups in log_group_t::checkpoint_buf */
+ #define LOG_MAX_N_GROUPS	32
+ 
++#define IB_ARCHIVED_LOGS_PREFIX		"ib_log_archive_"
++#define IB_ARCHIVED_LOGS_PREFIX_LEN	(sizeof(IB_ARCHIVED_LOGS_PREFIX) - 1)
++#define IB_ARCHIVED_LOGS_SERIAL_LEN	20
++
+ /*******************************************************************//**
+ Calculates where in log files we find a specified lsn.
+ @return	log file number */
+@@ -340,8 +344,18 @@
+ log_archived_file_name_gen(
+ /*=======================*/
+ 	char*	buf,	/*!< in: buffer where to write */
++	ulint	buf_len,/*!< in: buffer length */
+ 	ulint	id,	/*!< in: group id */
+-	ulint	file_no);/*!< in: file number */
++	lsn_t	file_no);/*!< in: file number */
++
++UNIV_INTERN
++void
++log_archived_get_offset(
++/*====================*/
++	log_group_t*	group,		/*!< in: log group */
++	lsn_t		file_no,	/*!< in: archive log file number */
++	lsn_t		archived_lsn,	/*!< in: last archived LSN */
++	lsn_t*		offset);	/*!< out: offset within archived file */
+ #else /* !UNIV_HOTBACKUP */
+ /******************************************************//**
+ Writes info to a buffer of a log group when log files are created in
+@@ -739,19 +753,19 @@
+ 	ulint		archive_space_id;/*!< file space which
+ 					implements the log group
+ 					archive */
+-	ulint		archived_file_no;/*!< file number corresponding to
++	lsn_t		archived_file_no;/*!< file number corresponding to
+ 					log_sys->archived_lsn */
+-	ulint		archived_offset;/*!< file offset corresponding to
++	lsn_t		archived_offset;/*!< file offset corresponding to
+ 					log_sys->archived_lsn, 0 if we have
+ 					not yet written to the archive file
+ 					number archived_file_no */
+-	ulint		next_archived_file_no;/*!< during an archive write,
++	lsn_t		next_archived_file_no;/*!< during an archive write,
+ 					until the write is completed, we
+ 					store the next value for
+ 					archived_file_no here: the write
+ 					completion function then sets the new
+ 					value to ..._file_no */
+-	ulint		next_archived_offset; /*!< like the preceding field */
++	lsn_t		next_archived_offset; /*!< like the preceding field */
+ #endif /* UNIV_LOG_ARCHIVE */
+ 	/*-----------------------------*/
+ 	lsn_t		scanned_lsn;	/*!< used only in recovery: recovery scan
+
+--- a/storage/innobase/include/log0recv.h
++++ b/storage/innobase/include/log0recv.h
+@@ -297,18 +297,13 @@
+ Recovers from archived log files, and also from log files, if they exist.
+ @return	error code or DB_SUCCESS */
+ UNIV_INTERN
+-ulint
++dberr_t
+ recv_recovery_from_archive_start(
+ /*=============================*/
+ 	lsn_t		min_flushed_lsn,/*!< in: min flushed lsn field from the
+ 					data files */
+-	lsn_t		limit_lsn,	/*!< in: recover up to this lsn if
++	lsn_t		limit_lsn);	/*!< in: recover up to this lsn if
+ 					possible */
+-	ulint		first_log_no);	/*!< in: number of the first archived
+-					log file to use in the recovery; the
+-					file will be searched from
+-					INNOBASE_LOG_ARCH_DIR specified in
+-					server config file */
+ /********************************************************//**
+ Completes recovery from archive. */
+ UNIV_INTERN
+
+--- a/storage/innobase/include/univ.i
++++ b/storage/innobase/include/univ.i
+@@ -46,6 +46,9 @@
+ #define INNODB_VERSION_MINOR	MYSQL_VERSION_MINOR
+ #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
+ 
++/* Enable UNIV_LOG_ARCHIVE in XtraDB */
++#define UNIV_LOG_ARCHIVE 1
++
+ /* The following is the InnoDB version as shown in
+ SELECT plugin_version FROM information_schema.plugins;
+ calculated in make_version_string() in sql/sql_show.cc like this:
+
+--- a/storage/innobase/log/log0log.cc
++++ b/storage/innobase/log/log0log.cc
+@@ -896,10 +896,10 @@
+ 		mem_zalloc(sizeof(byte**) * n_files));
+ 
+ #ifdef UNIV_LOG_ARCHIVE
+-	group->archive_file_header_bufs_ptr = static_cast<byte*>(
++	group->archive_file_header_bufs_ptr = static_cast<byte**>(
+ 		mem_zalloc( sizeof(byte*) * n_files));
+ 
+-	group->archive_file_header_bufs = static_cast<byte*>(
++	group->archive_file_header_bufs = static_cast<byte**>(
+ 		mem_zalloc(sizeof(byte*) * n_files));
+ #endif /* UNIV_LOG_ARCHIVE */
+ 
+@@ -924,7 +924,7 @@
+ #ifdef UNIV_LOG_ARCHIVE
+ 	group->archive_space_id = archive_space_id;
+ 
+-	group->archived_file_no = 0;
++	group->archived_file_no = LOG_START_LSN;
+ 	group->archived_offset = 0;
+ #endif /* UNIV_LOG_ARCHIVE */
+ 
+@@ -2228,7 +2228,7 @@
+ 	fil_io(OS_FILE_READ | OS_FILE_LOG, sync, group->space_id, 0,
+ 	       (ulint) (source_offset / UNIV_PAGE_SIZE),
+ 	       (ulint) (source_offset % UNIV_PAGE_SIZE),
+-	       len, buf, NULL);
++	       len, buf, (type == LOG_ARCHIVE) ? &log_archive_io : NULL);
+ 
+ 	start_lsn += len;
+ 	buf += len;
+@@ -2247,12 +2247,68 @@
+ log_archived_file_name_gen(
+ /*=======================*/
+ 	char*	buf,	/*!< in: buffer where to write */
++	ulint	buf_len,/*!< in: buffer length */
+ 	ulint	id __attribute__((unused)),
+ 			/*!< in: group id;
+ 			currently we only archive the first group */
+-	ulint	file_no)/*!< in: file number */
+-{
+-	sprintf(buf, "%sib_arch_log_%010lu", srv_arch_dir, (ulong) file_no);
++	lsn_t	file_no)/*!< in: file number */
++{
++	ulint	dirnamelen;
++
++	dirnamelen = strlen(srv_arch_dir);
++
++	ut_a(buf_len > dirnamelen +
++		       IB_ARCHIVED_LOGS_SERIAL_LEN +
++		       IB_ARCHIVED_LOGS_PREFIX_LEN + 2);
++
++	strcpy(buf, srv_arch_dir);
++
++	if (buf[dirnamelen-1] != SRV_PATH_SEPARATOR) {
++		buf[dirnamelen++] = SRV_PATH_SEPARATOR;
++	}
++	sprintf(buf + dirnamelen, IB_ARCHIVED_LOGS_PREFIX 
++		"%0" IB_TO_STR(IB_ARCHIVED_LOGS_SERIAL_LEN) "llu",
++		file_no);
++}
++
++/******************************************************//**
++Get offset within archived log file to continue to write
++with. */
++UNIV_INTERN
++void
++log_archived_get_offset(
++/*=====================*/
++	log_group_t*	group,		/*!< in: log group */
++	lsn_t		file_no,	/*!< in: archive log file number */
++	lsn_t		archived_lsn,	/*!< in: last archived LSN */
++	lsn_t*		offset)		/*!< out: offset within archived file */
++{
++	char		file_name[OS_FILE_MAX_PATH];
++	ibool		exists;
++	os_file_type_t	type;
++
++	log_archived_file_name_gen(file_name,
++		sizeof(file_name), group->id, file_no);
++
++	ut_a(os_file_status(file_name, &exists,	&type));
++
++	if (!exists) {
++		*offset = 0;
++		return;
++	}
++
++	*offset = archived_lsn - file_no + LOG_FILE_HDR_SIZE;
++
++	if (archived_lsn != IB_ULONGLONG_MAX) {
++		*offset = archived_lsn - file_no + LOG_FILE_HDR_SIZE;
++	} else {
++		/* Archiving was OFF prior startup */
++		*offset = 0;
++	}
++
++	ut_a(group->file_size >= *offset + LOG_FILE_HDR_SIZE);
++
++	return;
+ }
+ 
+ /******************************************************//**
+@@ -2290,6 +2346,7 @@
+ 	MONITOR_INC(MONITOR_LOG_IO);
+ 
+ 	fil_io(OS_FILE_WRITE | OS_FILE_LOG, TRUE, group->archive_space_id,
++	       0,
+ 	       dest_offset / UNIV_PAGE_SIZE,
+ 	       dest_offset % UNIV_PAGE_SIZE,
+ 	       2 * OS_FILE_LOG_BLOCK_SIZE,
+@@ -2325,6 +2382,7 @@
+ 	MONITOR_INC(MONITOR_LOG_IO);
+ 
+ 	fil_io(OS_FILE_WRITE | OS_FILE_LOG, TRUE, group->archive_space_id,
++	       0,
+ 	       dest_offset / UNIV_PAGE_SIZE,
+ 	       dest_offset % UNIV_PAGE_SIZE,
+ 	       OS_FILE_LOG_BLOCK_SIZE,
+@@ -2379,7 +2437,7 @@
+ 			open_mode = OS_FILE_OPEN;
+ 		}
+ 
+-		log_archived_file_name_gen(name, group->id,
++		log_archived_file_name_gen(name, sizeof(name), group->id,
+ 					   group->archived_file_no + n_files);
+ 
+ 		file_handle = os_file_create(innodb_file_log_key,
+@@ -2454,6 +2512,7 @@
+ 	MONITOR_INC(MONITOR_LOG_IO);
+ 
+ 	fil_io(OS_FILE_WRITE | OS_FILE_LOG, FALSE, group->archive_space_id,
++	       0,
+ 	       (ulint) (next_offset / UNIV_PAGE_SIZE),
+ 	       (ulint) (next_offset % UNIV_PAGE_SIZE),
+ 	       ut_calc_align(len, OS_FILE_LOG_BLOCK_SIZE), buf,
+@@ -2825,7 +2884,6 @@
+ 					 trunc_len);
+ 		if (increment_file_count) {
+ 			group->archived_offset = 0;
+-			group->archived_file_no += 2;
+ 		}
+ 
+ #ifdef UNIV_DEBUG
+@@ -3090,7 +3148,6 @@
+ /*=======================================*/
+ {
+ 	lsn_t			lsn;
+-	ulint			arch_log_no;
+ 	ulint			count = 0;
+ 	ulint			total_trx;
+ 	ulint			pending_io;
+@@ -3307,15 +3364,7 @@
+ 		goto loop;
+ 	}
+ 
+-	arch_log_no = 0;
+-
+ #ifdef UNIV_LOG_ARCHIVE
+-	UT_LIST_GET_FIRST(log_sys->log_groups)->archived_file_no;
+-
+-	if (0 == UT_LIST_GET_FIRST(log_sys->log_groups)->archived_offset) {
+-
+-		arch_log_no--;
+-	}
+ 
+ 	log_archive_close_groups(TRUE);
+ #endif /* UNIV_LOG_ARCHIVE */
+@@ -3374,7 +3423,16 @@
+ 	srv_shutdown_lsn = lsn;
+ 
+ 	if (!srv_read_only_mode) {
+-		fil_write_flushed_lsn_to_data_files(lsn, arch_log_no);
++		/*
++		  log_sys->lsn is aligned up to the log block size
++		  in recv_reset_logs(), but if archived logs are applied
++		  data files must contain exactly the same flushed_lsn
++		  on which applying was finished
++		*/
++		fil_write_flushed_lsn_to_data_files(
++			srv_archive_recovery ? recv_sys->recovered_lsn :
++			lsn,
++			0);
+ 
+ 		fil_flush_file_spaces(FIL_TABLESPACE);
+ 	}
+@@ -3597,7 +3655,7 @@
+ 
+ #ifdef UNIV_LOG_ARCHIVE
+ 	rw_lock_free(&log_sys->archive_lock);
+-	os_event_create();
++	os_event_free(log_sys->archiving_on);
+ #endif /* UNIV_LOG_ARCHIVE */
+ 
+ #ifdef UNIV_LOG_DEBUG
+
+--- a/storage/innobase/log/log0recv.cc
++++ b/storage/innobase/log/log0recv.cc
+@@ -53,6 +53,13 @@
+ //#else /* !UNIV_HOTBACKUP */
+ #include "xb0xb.h"
+ 
++/** The size of archived log file */
++extern ib_uint64_t xtrabackup_arch_file_size;
++/** The minimal LSN of found archived log files */
++extern ib_uint64_t xtrabackup_arch_first_file_lsn;
++/** The maximum LSN of found archived log files */
++extern ib_uint64_t xtrabackup_arch_last_file_lsn;
++
+ /** This is set to FALSE if the backup was originally taken with the
+ ibbackup --include regexp option: then we do not want to create tables in
+ directories which were not included */
+@@ -2866,7 +2873,10 @@
+ 				= log_block_get_checkpoint_no(log_block);
+ 		}
+ 
+-		if (data_len < OS_FILE_LOG_BLOCK_SIZE) {
++		/* Stop scanning if scanned lsn reaches lsn limit */
++		if (data_len < OS_FILE_LOG_BLOCK_SIZE ||
++		    (recv_sys->limit_lsn &&
++		    recv_sys->scanned_lsn >= recv_sys->limit_lsn)) {
+ 			/* Log data for this group ends here */
+ 
+ 			finished = TRUE;
+@@ -3157,10 +3167,14 @@
+ 	group = UT_LIST_GET_FIRST(log_sys->log_groups);
+ 
+ 	while (group) {
++		/* There is no need to read archived_file_no and
++		archived_offset because they are calculated another
++		way */
++		/*
+ 		log_checkpoint_get_nth_group_info(buf, group->id,
+ 						  &(group->archived_file_no),
+ 						  &(group->archived_offset));
+-
++		*/
+ 		group = UT_LIST_GET_NEXT(log_groups, group);
+ 	}
+ #endif /* UNIV_LOG_ARCHIVE */
+@@ -3731,23 +3745,23 @@
+ 	ulint		len;
+ 	ibool		ret;
+ 	byte*		buf;
+-	os_offset_t	read_offset;
++	os_offset_t	read_offset = 0;
+ 	os_offset_t	file_size;
+ 	int		input_char;
+-	char		name[10000];
++	char		name[OS_FILE_MAX_PATH];
+ 
+-	ut_a(0);
+ 
+ try_open_again:
+ 	buf = log_sys->buf;
+ 
+ 	/* Add the file to the archive file space; open the file */
+ 
+-	log_archived_file_name_gen(name, group->id, group->archived_file_no);
++	log_archived_file_name_gen(name, sizeof(name),
++				   group->id, group->archived_file_no);
+ 
+ 	file_handle = os_file_create(innodb_file_log_key,
+ 				     name, OS_FILE_OPEN,
+-				     OS_FILE_LOG, OS_FILE_AIO, &ret);
++				     OS_FILE_AIO, OS_LOG_FILE, &ret);
+ 
+ 	if (ret == FALSE) {
+ ask_again:
+@@ -3792,20 +3806,19 @@
+ 
+ 	/* Add the archive file as a node to the space */
+ 
+-	fil_node_create(name, 1 + file_size / UNIV_PAGE_SIZE,
+-			group->archive_space_id, FALSE);
+-#if RECV_SCAN_SIZE < LOG_FILE_HDR_SIZE
+-# error "RECV_SCAN_SIZE < LOG_FILE_HDR_SIZE"
+-#endif
++	ut_a(fil_node_create(name, 1 + file_size / UNIV_PAGE_SIZE,
++			     group->archive_space_id, FALSE));
++	ut_a(RECV_SCAN_SIZE >= LOG_FILE_HDR_SIZE);
+ 
+ 	/* Read the archive file header */
+-	fil_io(OS_FILE_READ | OS_FILE_LOG, TRUE, group->archive_space_id, 0, 0,
++	fil_io(OS_FILE_READ | OS_FILE_LOG, TRUE, group->archive_space_id, 0,
++	       0, 0,
+ 	       LOG_FILE_HDR_SIZE, buf, NULL);
+ 
+ 	/* Check if the archive file header is consistent */
+ 
+ 	if (mach_read_from_4(buf + LOG_GROUP_ID) != group->id
+-	    || mach_read_from_4(buf + LOG_FILE_NO)
++	    || mach_read_from_8(buf + LOG_FILE_START_LSN)
+ 	    != group->archived_file_no) {
+ 		fprintf(stderr,
+ 			"InnoDB: Archive file header inconsistent %s\n", name);
+@@ -3834,6 +3847,20 @@
+ 			return(TRUE);
+ 		}
+ 
++		/*
++		  if this is the first file of scanning set
++		  calculate offset of the first log record
++		*/
++		if (recv_sys->parse_start_lsn >= start_lsn &&
++		    recv_sys->parse_start_lsn < file_end_lsn) {
++			read_offset = ut_calc_align_down(
++				recv_sys->parse_start_lsn - start_lsn,
++				OS_FILE_LOG_BLOCK_SIZE);
++			start_lsn = ut_calc_align_down(
++				recv_sys->parse_start_lsn,
++				OS_FILE_LOG_BLOCK_SIZE);
++		}
++
+ 		recv_sys->scanned_lsn = start_lsn;
+ 	}
+ 
+@@ -3846,7 +3873,7 @@
+ 		return(TRUE);
+ 	}
+ 
+-	read_offset = LOG_FILE_HDR_SIZE;
++	read_offset += LOG_FILE_HDR_SIZE;
+ 
+ 	for (;;) {
+ 		len = RECV_SCAN_SIZE;
+@@ -3872,7 +3899,7 @@
+ #endif /* UNIV_DEBUG */
+ 
+ 		fil_io(OS_FILE_READ | OS_FILE_LOG, TRUE,
+-		       group->archive_space_id, read_offset / UNIV_PAGE_SIZE,
++		       group->archive_space_id, 0, read_offset / UNIV_PAGE_SIZE,
+ 		       read_offset % UNIV_PAGE_SIZE, len, buf, NULL);
+ 
+ 		ret = recv_scan_log_recs(
+@@ -3887,10 +3914,12 @@
+ 		}
+ 
+ 		if (ret) {
+-			fprintf(stderr,
+-				"InnoDB: Archive log file %s"
+-				" does not scan right\n",
+-				name);
++			if (recv_sys->scanned_lsn < recv_sys->limit_lsn) {
++				fprintf(stderr,
++					"InnoDB: Archive log file %s"
++					" does not scan right\n",
++					name);
++			}
+ 			return(TRUE);
+ 		}
+ 
+@@ -3907,26 +3936,19 @@
+ Recovers from archived log files, and also from log files, if they exist.
+ @return	error code or DB_SUCCESS */
+ UNIV_INTERN
+-ulint
++dberr_t
+ recv_recovery_from_archive_start(
+ /*=============================*/
+ 	ib_uint64_t	min_flushed_lsn,/*!< in: min flushed lsn field from the
+ 					data files */
+-	ib_uint64_t	limit_lsn,	/*!< in: recover up to this lsn if
++	ib_uint64_t	limit_lsn)	/*!< in: recover up to this lsn if
+ 					possible */
+-	ulint		first_log_no)	/*!< in: number of the first archived
+-					log file to use in the recovery; the
+-					file will be searched from
+-					INNOBASE_LOG_ARCH_DIR specified in
+-					server config file */
+ {
+ 	log_group_t*	group;
+ 	ulint		group_id;
+ 	ulint		trunc_len;
+ 	ibool		ret;
+-	ulint		err;
+-
+-	ut_a(0);
++	dberr_t		err;
+ 
+ 	recv_sys_create();
+ 	recv_sys_init(buf_pool_get_curr_size());
+@@ -3956,7 +3978,7 @@
+ 		return(DB_ERROR);
+ 	}
+ 
+-	group->archived_file_no = first_log_no;
++	group->archived_file_no = xtrabackup_arch_first_file_lsn;
+ 
+ 	recv_sys->parse_start_lsn = min_flushed_lsn;
+ 
+@@ -3970,7 +3992,8 @@
+ 
+ 	mutex_enter(&(log_sys->mutex));
+ 
+-	while (!ret) {
++	while (!ret &&
++	       group->archived_file_no <= xtrabackup_arch_last_file_lsn) {
+ 		ret = log_group_recover_from_archive_file(group);
+ 
+ 		/* Close and truncate a possible processed archive file
+@@ -3983,9 +4006,9 @@
+ 						 trunc_len);
+ 		}
+ 
+-		group->archived_file_no++;
++		group->archived_file_no += group->file_size - LOG_FILE_HDR_SIZE;
+ 	}
+-
++/*
+ 	if (recv_sys->recovered_lsn < limit_lsn) {
+ 
+ 		if (!recv_sys->scanned_lsn) {
+@@ -4006,12 +4029,12 @@
+ 
+ 		mutex_enter(&(log_sys->mutex));
+ 	}
+-
++*/
+ 	if (limit_lsn != IB_ULONGLONG_MAX) {
+ 
+ 		recv_apply_hashed_log_recs(FALSE);
+ 
+-		recv_reset_logs(0, FALSE, recv_sys->recovered_lsn);
++	//	recv_reset_logs(0, FALSE, recv_sys->recovered_lsn);
+ 	}
+ 
+ 	mutex_exit(&(log_sys->mutex));
+
+--- a/storage/innobase/srv/srv0start.cc
++++ b/storage/innobase/srv/srv0start.cc
+@@ -641,6 +641,12 @@
+ 		}
+ 	}
+ 
++#ifdef UNIV_LOG_ARCHIVE
++        /* Create the file space object for archived logs. */
++	fil_space_create("arch_log_space", SRV_LOG_SPACE_FIRST_ID + 1,
++			 0, FIL_LOG);
++#endif
++
+ 	log_group_init(0, srv_n_log_files,
+ 		       srv_log_file_size * UNIV_PAGE_SIZE,
+ 		       SRV_LOG_SPACE_FIRST_ID,
+@@ -651,7 +657,12 @@
+ 	/* Create a log checkpoint. */
+ 	mutex_enter(&log_sys->mutex);
+ 	ut_d(recv_no_log_write = FALSE);
+-	recv_reset_logs(lsn);
++	recv_reset_logs(
++#ifdef UNIV_LOG_ARCHIVE
++		UT_LIST_GET_FIRST(log_sys->log_groups)->archived_file_no,
++		TRUE,
++#endif
++		lsn);
+ 	mutex_exit(&log_sys->mutex);
+ 
+ 	return(DB_SUCCESS);
+@@ -738,12 +749,6 @@
+ /*======================*/
+ 	ibool*		create_new_db,	/*!< out: TRUE if new database should be
+ 					created */
+-#ifdef UNIV_LOG_ARCHIVE
+-	ulint*		min_arch_log_no,/*!< out: min of archived log
+-					numbers in data files */
+-	ulint*		max_arch_log_no,/*!< out: max of archived log
+-					numbers in data files */
+-#endif /* UNIV_LOG_ARCHIVE */
+ 	lsn_t*		min_flushed_lsn,/*!< out: min of flushed lsn
+ 					values in data files */
+ 	lsn_t*		max_flushed_lsn,/*!< out: max of flushed lsn
+@@ -964,9 +969,6 @@
+ skip_size_check:
+ 			fil_read_first_page(
+ 				files[i], one_opened, &flags, &space,
+-#ifdef UNIV_LOG_ARCHIVE
+-				min_arch_log_no, max_arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 				min_flushed_lsn, max_flushed_lsn);
+ 
+ 			/* The first file of the system tablespace must
+@@ -1450,8 +1452,8 @@
+ 	lsn_t		min_flushed_lsn;
+ 	lsn_t		max_flushed_lsn;
+ #ifdef UNIV_LOG_ARCHIVE
+-	ulint		min_arch_log_no;
+-	ulint		max_arch_log_no;
++	lsn_t		min_arch_log_no;
++	lsn_t		max_arch_log_no;
+ #endif /* UNIV_LOG_ARCHIVE */
+ 	ulint		sum_of_new_sizes;
+ 	ulint		sum_of_data_file_sizes;
+@@ -1890,17 +1892,6 @@
+ 		os_thread_create(io_handler_thread, n + i, thread_ids + i);
+ 	}
+ 
+-#ifdef UNIV_LOG_ARCHIVE
+-	if (0 != ut_strcmp(srv_log_group_home_dir, srv_arch_dir)) {
+-		ut_print_timestamp(stderr);
+-		fprintf(stderr, " InnoDB: Error: you must set the log group home dir in my.cnf\n");
+-		ut_print_timestamp(stderr);
+-		fprintf(stderr, " InnoDB: the same as log arch dir.\n");
+-
+-		return(DB_ERROR);
+-	}
+-#endif /* UNIV_LOG_ARCHIVE */
+-
+ 	if (srv_n_log_files * srv_log_file_size * UNIV_PAGE_SIZE
+ 	    >= 512ULL * 1024ULL * 1024ULL * 1024ULL) {
+ 		/* log_block_convert_lsn_to_no() limits the returned block
+@@ -1959,9 +1950,6 @@
+ 	}
+ 
+ 	err = open_or_create_data_files(&create_new_db,
+-#ifdef UNIV_LOG_ARCHIVE
+-					&min_arch_log_no, &max_arch_log_no,
+-#endif /* UNIV_LOG_ARCHIVE */
+ 					&min_flushed_lsn, &max_flushed_lsn,
+ 					&sum_of_new_sizes);
+ 	if (err == DB_FAIL) {
+@@ -1989,7 +1977,6 @@
+ 
+ #ifdef UNIV_LOG_ARCHIVE
+ 	srv_normalize_path_for_win(srv_arch_dir);
+-	srv_arch_dir = srv_add_path_separator_if_needed(srv_arch_dir);
+ #endif /* UNIV_LOG_ARCHIVE */
+ 
+ 	dirnamelen = strlen(srv_log_group_home_dir);
+@@ -2068,9 +2055,15 @@
+ 						max_flushed_lsn, logfile0);
+ 
+ 					/* Suppress the message about
+-					crash recovery. */
+-					max_flushed_lsn = min_flushed_lsn
+-						= log_get_lsn();
++					crash recovery. If archive recovery
++					is enabled the min/max_flushed_lsn
++					must point to the position from
++					which applying is started. */
++					if (!srv_archive_recovery) {
++						max_flushed_lsn = min_flushed_lsn
++							= log_get_lsn();
++					}
++
+ 					goto files_checked;
+ #if 0
+ 				} else if (i < 2) {
+@@ -2244,10 +2237,13 @@
+ 
+ 		ib_logf(IB_LOG_LEVEL_INFO,
+ 			" Starting archive recovery from a backup...");
++		/* Load table spaces before recovery as during recovery
++		there can be log records that are applied to the spaces
++		with unknown id's */
++		fil_load_single_table_tablespaces(NULL);
+ 
+ 		err = recv_recovery_from_archive_start(
+-			min_flushed_lsn, srv_archive_recovery_limit_lsn,
+-			min_arch_log_no);
++			min_flushed_lsn, srv_archive_recovery_limit_lsn);
+ 		if (err != DB_SUCCESS) {
+ 
+ 			return(DB_ERROR);
+@@ -2271,6 +2267,11 @@
+ 		srv_startup_is_before_trx_rollback_phase = FALSE;
+ 
+ 		recv_recovery_from_archive_finish();
++
++		if (srv_apply_log_only) {
++			goto skip_processes;
++		}
++
+ #endif /* UNIV_LOG_ARCHIVE */
+ 	} else {
+ 
+@@ -2478,6 +2479,8 @@
+ 	if (!srv_log_archive_on) {
+ 		ut_a(DB_SUCCESS == log_archive_noarchivelog());
+ 	} else {
++		bool	start_archive;
++
+ 		mutex_enter(&(log_sys->mutex));
+ 
+ 		start_archive = FALSE;
+
+--- a/storage/innobase/trx/trx0sys.cc
++++ b/storage/innobase/trx/trx0sys.cc
+@@ -1185,7 +1185,8 @@
+ 	trx_purge_sys_close();
+ 
+ 	/* Free the double write data structures. */
+-	buf_dblwr_free();
++	if (buf_dblwr)
++		buf_dblwr_free();
+ 
+ 	mutex_enter(&trx_sys->mutex);
+ 
+

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-08-20 17:43:45 +0000
+++ src/xtrabackup.cc	2013-08-26 07:08:27 +0000
@@ -118,6 +118,8 @@
 char *xtrabackup_extra_lsndir = NULL; /* for --backup with --extra-lsndir */
 char *xtrabackup_incremental_dir = NULL; /* for --prepare */
 
+lsn_t xtrabackup_archived_to_lsn = 0; /* for --archived-to-lsn */
+
 char *xtrabackup_tables = NULL;
 int tables_regex_num;
 xb_regex_t *tables_regex;
@@ -279,6 +281,17 @@
 
 static my_bool xtrabackup_incremental_force_scan = FALSE;
 
+/* The flushed lsn which is read from data files */
+lsn_t	min_flushed_lsn= 0;
+lsn_t	max_flushed_lsn= 0;
+
+/* The size of archived log file */
+size_t xtrabackup_arch_file_size = 0ULL;
+/* The minimal LSN of found archived log files */
+lsn_t xtrabackup_arch_first_file_lsn = 0ULL;
+/* The maximum LSN of found archived log files */
+lsn_t xtrabackup_arch_last_file_lsn = 0ULL;
+
 /* Datasinks */
 ds_ctxt_t       *ds_data     = NULL;
 ds_ctxt_t       *ds_meta     = NULL;
@@ -388,6 +401,7 @@
   OPT_XTRA_INCREMENTAL_BASEDIR,
   OPT_XTRA_EXTRA_LSNDIR,
   OPT_XTRA_INCREMENTAL_DIR,
+  OPT_XTRA_ARCHIVED_TO_LSN,
   OPT_XTRA_TABLES,
   OPT_XTRA_TABLES_FILE,
   OPT_XTRA_CREATE_IB_LOGFILE,
@@ -551,6 +565,12 @@
   {"incremental-dir", OPT_XTRA_INCREMENTAL_DIR, "(for --prepare): apply .delta files and logfile in the specified directory.",
    (G_PTR*) &xtrabackup_incremental_dir, (G_PTR*) &xtrabackup_incremental_dir,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef UNIV_LOG_ARCHIVE
+ {"to-archived-lsn", OPT_XTRA_ARCHIVED_TO_LSN,
+   "Don't apply archived logs with bigger log sequence number.",
+   (G_PTR*) &xtrabackup_archived_to_lsn, (G_PTR*) &xtrabackup_archived_to_lsn, 0,
+   GET_LL, REQUIRED_ARG, 0, 0, LONGLONG_MAX, 0, 0, 0},
+#endif /* UNIV_LOG_ARCHIVE */
   {"tables", OPT_XTRA_TABLES, "filtering by regexp for table names.",
    (G_PTR*) &xtrabackup_tables, (G_PTR*) &xtrabackup_tables,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -733,11 +753,11 @@
    (G_PTR*) &innobase_locks_unsafe_for_binlog,
    (G_PTR*) &innobase_locks_unsafe_for_binlog, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 */
-/*
+#ifdef UNIV_LOG_ARCHIVE
   {"innodb_log_arch_dir", OPT_INNODB_LOG_ARCH_DIR,
    "Where full logs should be archived.", (G_PTR*) &innobase_log_arch_dir,
    (G_PTR*) &innobase_log_arch_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-*/
+#endif /* UNIV_LOG_ARCHIVE */
   {"innodb_log_buffer_size", OPT_INNODB_LOG_BUFFER_SIZE,
    "The size of the buffer which InnoDB uses to write log to the log files on disk.",
    (G_PTR*) &innobase_log_buffer_size, (G_PTR*) &innobase_log_buffer_size, 0,
@@ -2573,8 +2593,6 @@
 	ibool	create_new_doublewrite_file;
 #endif
 	ulint	err;
-	lsn_t	min_flushed_lsn;
-	lsn_t	max_flushed_lsn;
 	ulint   sum_of_new_sizes;
 
 	for (i = 0; i < srv_n_file_io_threads; i++) {
@@ -5146,6 +5164,76 @@
 
 }
 
+#ifdef UNIV_LOG_ARCHIVE
+/********************************************************************//**
+Searches archived log files in archived log directory. The min and max
+LSN's of found files as well as archived log file size are stored in
+xtrabackup_arch_first_file_lsn, xtrabackup_arch_last_file_lsn and
+xtrabackup_arch_file_size respectively.
+@return true on success
+*/
+static
+bool
+xtrabackup_arch_search_files(
+/*=========================*/
+	ib_uint64_t	start_lsn)		/*!< in: filter out log files
+						witch does not contain data
+						with lsn < start_lsn */
+{
+	os_file_dir_t	dir;
+	os_file_stat_t	fileinfo;
+	ut_ad(innobase_log_arch_dir);
+
+	dir = os_file_opendir(innobase_log_arch_dir, FALSE);
+	if (!dir) {
+		msg("xtrabackup: error: cannot open archived log directory %s\n",
+		    innobase_log_arch_dir);
+		return false;
+	}
+
+	while(!os_file_readdir_next_file(innobase_log_arch_dir,
+					 dir,
+					 &fileinfo) ) {
+		lsn_t	log_file_lsn;
+		char*	log_str_end_lsn_ptr;
+
+		if (strncmp(fileinfo.name,
+			    IB_ARCHIVED_LOGS_PREFIX,
+			    sizeof(IB_ARCHIVED_LOGS_PREFIX) - 1)) {
+			continue;
+		}
+
+		log_file_lsn = strtoll(fileinfo.name +
+				       sizeof(IB_ARCHIVED_LOGS_PREFIX) - 1,
+				       &log_str_end_lsn_ptr, 10);
+
+		if (*log_str_end_lsn_ptr) {
+			continue;
+		}
+
+		if (log_file_lsn + (fileinfo.size - LOG_FILE_HDR_SIZE)	< start_lsn) {
+			continue;
+		}
+
+		if (!xtrabackup_arch_first_file_lsn ||
+		    log_file_lsn < xtrabackup_arch_first_file_lsn) {
+			xtrabackup_arch_first_file_lsn = log_file_lsn;
+		}
+		if (log_file_lsn > xtrabackup_arch_last_file_lsn) {
+			xtrabackup_arch_last_file_lsn = log_file_lsn;
+		}
+
+		//TODO: find the more suitable way to extract archived log file
+		//size
+		if (fileinfo.size > (ib_int64_t)xtrabackup_arch_file_size) {
+			xtrabackup_arch_file_size = fileinfo.size;
+		}
+	}
+
+	return xtrabackup_arch_first_file_lsn != 0;
+}
+#endif /* UNIV_LOG_ARCHIVE */
+
 static void
 xtrabackup_prepare_func(void)
 {
@@ -5169,14 +5257,18 @@
 	xtrabackup_target_dir[0]=FN_CURLIB;		// all paths are relative from here
 	xtrabackup_target_dir[1]=0;
 
-	/* read metadata of target */
+	/*
+	  read metadata of target, we don't need metadata reading in the case
+	  archived logs applying
+	*/
+	sprintf(metadata_path, "%s/%s", xtrabackup_target_dir,
+		XTRABACKUP_METADATA_FILENAME);
+
+	if (!xtrabackup_read_metadata(metadata_path))
+		msg("xtrabackup: error: xtrabackup_read_metadata()\n");
+
+	if (!innobase_log_arch_dir)
 	{
-		sprintf(metadata_path, "%s/%s", xtrabackup_target_dir,
-			XTRABACKUP_METADATA_FILENAME);
-
-		if (!xtrabackup_read_metadata(metadata_path))
-			msg("xtrabackup: error: xtrabackup_read_metadata()\n");
-
 		if (!strcmp(metadata_type, "full-backuped")) {
 			msg("xtrabackup: This target seems to be not prepared "
 			    "yet.\n");
@@ -5220,7 +5312,7 @@
 	mem_init(srv_mem_pool_size);
 	ut_crc32_init();
 
-	if(xtrabackup_init_temp_log())
+	if(!innobase_log_arch_dir && xtrabackup_init_temp_log())
 		goto error;
 
 	if(innodb_init_param()) {
@@ -5248,14 +5340,15 @@
 
 	xb_normalize_init_values();
 
-	if (xtrabackup_incremental) {
+	if (xtrabackup_incremental || innobase_log_arch_dir) {
 		err = xb_data_files_init();
 		if (err != DB_SUCCESS) {
 			msg("xtrabackup: error: xb_data_files_init() failed "
 			    "with error code %lu\n", err);
 			goto error;
 		}
-
+	}
+	if (xtrabackup_incremental) {
 		inc_dir_tables_hash = hash_create(1000);
 
 		if(!xtrabackup_apply_deltas()) {
@@ -5263,9 +5356,11 @@
 			xb_tables_hash_free(inc_dir_tables_hash);
 			goto error;
 		}
-
+	}
+	if (xtrabackup_incremental || innobase_log_arch_dir) {
 		xb_data_files_close();
-
+	}
+	if (xtrabackup_incremental) {
 		/* Cleanup datadir from tablespaces deleted between full and
 		incremental backups */
 
@@ -5295,6 +5390,55 @@
 		srv_n_write_io_threads = 4;
 	}
 
+#ifdef UNIV_LOG_ARCHIVE
+	if (innobase_log_arch_dir) {
+		srv_arch_dir = innobase_log_arch_dir;
+		srv_archive_recovery = TRUE;
+		if (xtrabackup_archived_to_lsn) {
+			if (xtrabackup_archived_to_lsn < metadata_last_lsn) {
+				msg("xtrabackup: warning: logs applying lsn "
+				    "limit " UINT64PF " is "
+				    "less than metadata last-lsn " UINT64PF
+				    " and will be set to metadata last-lsn value\n",
+				    xtrabackup_archived_to_lsn,
+				    metadata_last_lsn);
+				xtrabackup_archived_to_lsn = metadata_last_lsn;
+			}
+			if (xtrabackup_archived_to_lsn < min_flushed_lsn) {
+				msg("xtrabackup: error: logs applying "
+				    "lsn limit " UINT64PF " is less than "
+				    "min_flushed_lsn " UINT64PF
+				    ", there is nothing to do\n",
+				    xtrabackup_archived_to_lsn,
+				    min_flushed_lsn);
+				goto error;
+			}
+		}
+		srv_archive_recovery_limit_lsn= xtrabackup_archived_to_lsn;
+		/*
+		  Unfinished transactions are not rolled back during log applying
+		  as they can be finished at the firther files applyings.
+		*/
+		srv_apply_log_only = TRUE;
+
+		if (!xtrabackup_arch_search_files(min_flushed_lsn)) {
+			goto error;
+		}
+
+		/*
+		  Check if last log file last lsn is big enough to overlap
+		  last scanned lsn read from metadata.
+		*/
+		if (xtrabackup_arch_last_file_lsn +
+		    xtrabackup_arch_file_size -
+		    LOG_FILE_HDR_SIZE < metadata_last_lsn) {
+			msg("xtrabackup: error: there are no enough archived logs "
+			    "to apply\n");
+			goto error;
+		}
+	}
+#endif /* UNIV_LOG_ARCHIVE */
+
 	msg("xtrabackup: Starting InnoDB instance for recovery.\n"
 	    "xtrabackup: Using %lld bytes for buffer pool "
 	    "(set by --use-memory parameter)\n", xtrabackup_use_memory);
@@ -5517,7 +5661,10 @@
 			    "'xtrabackup_binlog_pos_innodb'\n");
 		}
 	}
-
+#ifdef UNIV_LOG_ARCHIVE
+	if (innobase_log_arch_dir)
+		srv_start_lsn = log_sys->lsn = recv_sys->recovered_lsn;
+#endif /* UNIV_LOG_ARCHIVE */
 	/* Check whether the log is applied enough or not. */
 	if ((xtrabackup_incremental
 	     && ut_dulint_cmp(srv_start_lsn, incremental_last_lsn) < 0)
@@ -5829,6 +5976,14 @@
 		exit(EXIT_FAILURE);
 	}
 
+        if (!xtrabackup_prepare &&
+            (innobase_log_arch_dir || xtrabackup_archived_to_lsn)) {
+		msg("xtrabackup: error: "
+		    "--archived-logs-dir and --to-archived-lsn can be used "
+		    "only with --prepare\n");
+		exit(EXIT_FAILURE);
+        }
+
 	/* cannot execute both for now */
 	{
 		int num = 0;

=== added file 'test/t/xb_apply_archived_logs.sh'
--- test/t/xb_apply_archived_logs.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_apply_archived_logs.sh	2013-08-26 07:08:27 +0000
@@ -0,0 +1,389 @@
+. inc/common.sh
+
+#The result to return
+RESULT=0
+
+function repeat_until_new_arch_log_created
+{
+	local arch_log_dir=$1
+	local command=$2
+	local stop_lsn=`run_cmd $MYSQL $MYSQL_ARGS test -e 'SHOW ENGINE INNODB STATUS\G'|grep 'Log sequence number'|awk '{print $4}'`
+	local old_arch_logs_count=`ls -al $arch_log_dir/| wc -l`
+	local new_arch_logs_count=0
+
+	echo $old_arch_logs_count
+	# To be sure the data was flushed to archived log wait until new file
+	# with START_LSN > CURRENT_LSN is created
+	local max_lsn=0;
+	while [ $max_lsn -le $stop_lsn ];
+	do
+		$command
+		for i in `ls -1 $arch_log_dir`;
+		do
+			local lsn=`echo $i | sed -s 's/ib_log_archive_\([0-9]\+\)/\1/'`
+			if [ $lsn -gt $max_lsn ];
+			then
+				max_lsn=$lsn
+			fi
+		done
+	done
+}
+
+function check_if_equal
+{
+	local NAME=$1
+	local VAL1=$2
+	local VAL2=$3
+	local MSG="$NAME ($VAL1 == $VAL2):"
+	if [ $VAL1 -ne $VAL2 ]
+	then
+		vlog "$MSG failed"
+		RESULT=-1
+	else
+		vlog "$MSG passed"
+	fi
+}
+
+function check_if_not_equal
+{
+	local NAME=$1
+	local VAL1=$2
+	local VAL2=$3
+	local MSG="$NAME ($VAL1 != $VAL2):"
+	if [ $VAL1 -eq $VAL2 ]
+	then
+		vlog "$MSG failed"
+		RESULT=-1
+	else
+		vlog "$MSG passed"
+	fi
+}
+
+function fill_tables
+{
+	local TABLES_COUNT=$1
+	local TABLE_NAME=$2
+
+	for i in `seq 1 $TABLES_COUNT`; do
+		local TN=$TABLE_NAME$i
+		run_cmd $MYSQL $MYSQL_ARGS test \
+<<EOF
+		INSERT INTO $TN (B)
+			SELECT ${TN}_1.B FROM
+				$TN ${TN}_1,
+				$TN ${TN}_2,
+				$TN ${TN}_3
+				LIMIT 10000;
+
+EOF
+	done
+}
+
+function create_and_fill_db
+{
+	local TABLES_COUNT=$1
+	local TABLE_NAME=$2
+	local ARCH_LOG_DIR=$3
+	local CREATE_TABLE_OPTIONS=${4:-''}
+
+	for i in `seq 1 $TABLES_COUNT`; do
+		local TN=$TABLE_NAME$i
+
+		run_cmd $MYSQL $MYSQL_ARGS test \
+<<EOF
+		CREATE TABLE $TN
+			(A INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+			 B INT(10) UNSIGNED NOT NULL DEFAULT 0) ENGINE=INNODB $CREATE_TABLE_OPTIONS;
+		INSERT INTO $TN (B) VALUES (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1),
+					   (1),(1),(1),(1),(1),(1),(1),(1),(1),(1);
+EOF
+	done
+
+	repeat_until_new_arch_log_created \
+		$ARCH_LOG_DIR \
+		"fill_tables $TABLES_COUNT $TABLE_NAME"
+}
+
+function make_changes
+{
+	local START_I=$1
+	local TABLES_COUNT=$2
+	local TABLE_NAME=$3
+	local CLIENT_CMD="${MYSQL} ${MYSQL_ARGS} -Ns test -e"
+
+	for i in `seq $START_I $(($START_I+$TABLES_COUNT-1))`; do
+		local TN=$TABLE_NAME$(($i-$START_I+1))
+
+		#INSERT
+		I_FROM[$i]=`$CLIENT_CMD "select max(a) from $TN"`
+		$CLIENT_CMD "insert into $TN (b) select b from $TN limit 1000"
+		I_TO[$i]=`$CLIENT_CMD "select max(a) from $TN"`
+		vlog "Inserted rows for $i are in the range [${I_FROM[$i]}, ${I_TO[$i]})"
+		I_COUNT[$i]=`$CLIENT_CMD "select count(*) from $TN where a >= ${I_FROM[$i]} and a < ${I_TO[$i]} "`
+
+		#DELETE
+		if [ $i -gt $TABLES_COUNT ];
+		then
+			local START_ROW=${U_TO[$(($i-$TABLES_COUNT))]}
+		else
+			local START_ROW=1000
+		fi
+		D_FROM[$i]=`$CLIENT_CMD "select min(a) from (select a from $TN where a >= $START_ROW limit 1000) as temp_table"`
+		D_TO[$i]=`$CLIENT_CMD "select max(a) from (select a from $TN where a >= $START_ROW limit 1000) as temp_table"`
+		D_COUNT[$i]=`$CLIENT_CMD "select count(*) from $TN where a>=${D_FROM[$i]} and a<${D_TO[$i]}"`
+		$CLIENT_CMD "delete from $TN where a >= ${D_FROM[$i]} and a < ${D_TO[$i]}"
+		vlog "Deleted rows for $i are in the range [${D_FROM[$i]}, ${D_TO[$i]}), total ${D_COUNT[$i]} are deleted"
+
+		#UPDATE
+		U_FROM[$i]=${D_TO[$i]}
+		U_TO[$i]=`$CLIENT_CMD "select max(a) from (select a from $TN where a >= ${U_FROM[$i]} limit 1000) as temp_table"`
+		U_COUNT[$i]=`$CLIENT_CMD "select count(*) from $TN where a>=${U_FROM[$i]} and a<${U_TO[$i]}"`
+		$CLIENT_CMD "update $TN set b=2 where a >= ${U_FROM[$i]} and a < ${U_TO[$i]}"
+		vlog "Updated rows for $i are in the range [${U_FROM[$i]}, ${U_TO[$i]}), total ${U_COUNT[$i]} are updated"
+
+	done
+}
+
+function get_changes
+{
+	local START_I=$1
+	local TABLES_COUNT=$2
+	local TABLE_NAME=$3
+	local CLIENT_CMD="${MYSQL} ${MYSQL_ARGS} -Ns test -e"
+
+	for i in `seq $START_I $(($START_I+$TABLES_COUNT-1))`; do
+		local TN=$TABLE_NAME$(($i-$START_I+1))
+
+		#INSERT
+		I_COUNT1[$i]=`$CLIENT_CMD "select count(*) from $TN where a >= ${I_FROM[$i]} and a < ${I_TO[$i]} "`
+		#DELETE
+		D_COUNT1[$i]=`$CLIENT_CMD "select count(*) from $TN where a >= ${D_FROM[$i]} and a < ${D_TO[$i]} "`
+		#UPDATE
+		U_COUNT1[$i]=`$CLIENT_CMD "select count(*) from $TN where a >= ${U_FROM[$i]} and a < ${U_TO[$i]} and b = 2"`
+	done 
+}
+
+function check_changes
+{
+	local START_I=$1
+	local TABLES_COUNT=$2
+	local CMD=$3
+
+	for i in `seq $START_I $(($START_I+$TABLES_COUNT-1))`; do
+		$CMD "INSERT TEST for $i" ${I_COUNT[$i]} ${I_COUNT1[$i]}
+		$CMD "DELETE TEST for $i" 0 ${D_COUNT1[$i]}
+		$CMD "UPDATE TEST for $i" ${U_COUNT[$i]} ${U_COUNT1[$i]}
+	done
+}
+
+function unset_global_variables
+{
+	unset I_FROM
+	unset I_TO
+	unset I_COUNT
+
+	unset D_FROM
+	unset D_TO
+	unset D_COUNT
+
+	unset U_FROM
+	unset U_TO
+	unset U_COUNT
+
+	unset I_FROM1
+	unset I_TO1
+	unset I_COUNT1
+
+	unset D_FROM1
+	unset D_TO1
+	unset D_COUNT1
+
+	unset U_FROM1
+	unset U_TO1
+	unset U_COUNT1
+}
+
+function test_archived_logs
+{
+	local TABLE_NAME=T
+	local TABLES_COUNT=4
+	local EXTRA_OPTIONS=${1:-''}
+	local CREATE_TABLE_OPTIONS=${2:-''}
+
+	#Setup server environment to get access to some variables
+	init_server_variables 1
+	switch_server 1
+	local BASE_BACKUP_DIR=$topdir/backup_base
+	local BACKUP_DIR=$topdir/backup
+	local BASE_DATA_DIR=$topdir/base_data
+	local ARCHIVED_LOGS_DIR=$topdir/archived_logs
+	local XTRABACKUP_OPTIONS="--innodb_log_file_size=2M $EXTRA_OPTIONS"
+	#Setup ROW binlog format to supress warnings in result file
+	local SERVER_OPTIONS="$XTRABACKUP_OPTIONS --innodb_log_archive=ON --innodb_log_arch_dir=$ARCHIVED_LOGS_DIR  --binlog-format=ROW"
+	mkdir -p $BASE_BACKUP_DIR $BACKUP_DIR
+	mkdir -p $ARCHIVED_LOGS_DIR
+	reset_server_variables 1
+
+	###################################################################
+	# --to-lsn test. It checks the availability to apply logs only to #
+	# the certain LSN.                                                #
+	###################################################################
+	start_server $SERVER_OPTIONS
+	#Create and fill tables to generate log files
+	create_and_fill_db $TABLES_COUNT $TABLE_NAME $ARCHIVED_LOGS_DIR $CREATE_TABLE_OPTIONS
+	#Backup the data
+	xtrabackup --backup --datadir=$mysql_datadir --target-dir=$BASE_BACKUP_DIR $XTRABACKUP_OPTIONS
+	#Make some changes in tables after backup is done
+	make_changes 1 $TABLES_COUNT $TABLE_NAME
+	#Make sure that changes are flushed to archived log
+	repeat_until_new_arch_log_created \
+		$ARCHIVED_LOGS_DIR \
+		"fill_tables $TABLES_COUNT $TABLE_NAME"
+	#Remember current LSN
+	local LSN=`run_cmd $MYSQL $MYSQL_ARGS test -e 'SHOW ENGINE INNODB STATUS\G'|grep 'Log sequence number'|awk '{print $4}'`
+	#Make more changes over remembered LSN
+	make_changes $(($TABLES_COUNT+1)) $TABLES_COUNT $TABLE_NAME
+	#Make sure the above changes are flushed to archived log
+	repeat_until_new_arch_log_created \
+		$ARCHIVED_LOGS_DIR \
+		"fill_tables $TABLES_COUNT $TABLE_NAME"
+	stop_server
+	cp -R $mysql_datadir $BASE_DATA_DIR
+
+	#########################################
+	# Apply logs only to the remembered lsn #
+	#########################################
+	# --apply-logs-only is set implicitly because unfinished transactions
+	# can be finished on further logs applying but using this option with
+	# --innodb-log-arch-dir is tested here to prove this bug
+	# https://bugs.launchpad.net/percona-xtrabackup/+bug/1199555 is not
+	# concerned with this case
+	cp -R $BASE_BACKUP_DIR/* $BACKUP_DIR
+	xtrabackup --prepare \
+		   --target-dir=$BACKUP_DIR \
+		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR \
+		   --to-archived-lsn=$LSN \
+		   --apply-logs-only \
+		   $XTRABACKUP_OPTIONS
+	#Copy prepared data to server data dir
+	cp -R $BACKUP_DIR/* $mysql_datadir
+	rm $mysql_datadir/ib_*
+	#Start server with prepared data
+	start_server "--binlog-format=ROW $EXTRA_OPTIONS"
+	#Get values from restored data files before remembered LSN
+	get_changes 1 $TABLES_COUNT $TABLE_NAME
+	#Get values from restored data files after remembered LSN
+	get_changes $(($TABLES_COUNT+1)) $TABLES_COUNT $TABLE_NAME
+	#We don't need server already
+	stop_server
+	#Check if the changes which was made before remembered LSN are in the
+	#restored databse
+	check_changes 1 $TABLES_COUNT 'check_if_equal'
+	#Check if the changes which was made after remembered LSN are NOT in the
+	#restored databse
+	check_changes $(($TABLES_COUNT+1)) $TABLES_COUNT 'check_if_not_equal'
+	# Apply the rest of archived logs
+	xtrabackup --prepare \
+		   --target-dir=$BACKUP_DIR \
+		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR \
+		   --apply-logs-only \
+		   $XTRABACKUP_OPTIONS
+	#Copy prepared data to server data dir
+	cp -R $BACKUP_DIR/* $mysql_datadir
+	rm $mysql_datadir/ib_*
+	#Start server with prepared data
+	start_server "--binlog-format=ROW $EXTRA_OPTIONS"
+	#Get values from restored data files before remembered LSN
+	get_changes 1 $TABLES_COUNT $TABLE_NAME
+	#Get values from restored data files after remembered LSN
+	get_changes $(($TABLES_COUNT+1)) $TABLES_COUNT $TABLE_NAME
+	stop_server
+	#Check if the changes which was made before remembered LSN are in the
+	#restored databse
+	check_changes 1 $TABLES_COUNT 'check_if_equal'
+	#Check if the changes which was made after remembered LSN are in the
+	#restored databse
+	check_changes $(($TABLES_COUNT+1)) $TABLES_COUNT 'check_if_equal'
+	rm -rf $mysql_datadir
+	rm -rf $BACKUP_DIR
+
+	##################################################
+	# Check the possibility of applying logs by sets #
+	##################################################
+	cp -R $BASE_DATA_DIR $mysql_datadir
+	cp -R $BASE_BACKUP_DIR $BACKUP_DIR
+	mkdir -p $ARCHIVED_LOGS_DIR/1 $ARCHIVED_LOGS_DIR/2
+	#Make two log files sets. The first set contains the first two files,
+	#the second set contains the rest and the last log file from the first
+	#set.
+	pushd .
+	cd $ARCHIVED_LOGS_DIR
+	for i in `find . -type f -printf "%T+ %p\n" | cut -d' ' -f2`;
+	do
+		local n=`echo $i | sed 's/.*ib_log_archive_\([0-9]*\).*/\1/'`;
+		if [ $n -le $LSN ];
+		then
+			mv $i 1/;
+		else
+			mv $i 2/;
+		fi;
+	done
+	cd 1
+	find . -type f -printf "%T+ %p\n" | cut -d' ' -f2 | sort -n | tail -1 | \
+		xargs -I{} cp {} ../2/
+	popd
+	#Prepare the first set
+	xtrabackup --prepare \
+		   --target-dir=$BACKUP_DIR \
+		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR/1 \
+		   $XTRABACKUP_OPTIONS
+	#Prepare the second set
+	xtrabackup --prepare \
+		   --target-dir=$BACKUP_DIR \
+		   --innodb-log-arch-dir=$ARCHIVED_LOGS_DIR/2 \
+		   $XTRABACKUP_OPTIONS
+	#Copy prepared data to server data dir
+	cp -R $BACKUP_DIR/* $mysql_datadir
+	rm $mysql_datadir/ib_*
+	#Start server with prepared data
+	start_server "--binlog-format=ROW $EXTRA_OPTIONS"
+	#Get values from restored data files before remembered LSN
+	get_changes 1 $TABLES_COUNT $TABLE_NAME
+	#Get values from restored data files after remembered LSN
+	get_changes $(($TABLES_COUNT+1)) $TABLES_COUNT $TABLE_NAME
+	stop_server
+	#Check all made changes
+	check_changes 1 $TABLES_COUNT 'check_if_equal'
+	check_changes $(($TABLES_COUNT+1)) $TABLES_COUNT 'check_if_equal'
+
+	#Clean up dir for the next procedure launch
+	rm -rf $BACKUP_DIR/* $BASE_BACKUP_DIR/*
+	rm -rf $mysql_datadir $BASE_DATA_DIR
+	rm -rf $ARCHIVED_LOGS_DIR/*
+
+	#Clean up variables
+	unset_global_variables
+}
+
+require_xtradb
+require_server_version_higher_than '5.6.10'
+
+
+if [ `basename $XB_BIN` = 'xtrabackup_56' ]
+then
+	test_archived_logs
+	test_archived_logs '' 'ROW_FORMAT=COMPRESSED'
+else
+	echo 'Requires xtrabackup built with XtraDB >= 5.6' > $SKIPPED_REASON
+	exit $SKIPPED_EXIT_CODE   
+fi
+
+exit $RESULT