Merge lp:~sergei.glushchenko/percona-server/ps56-univ-log-archive into lp:percona-server/5.6

[Sergei Glushchenko]

Implementation of log archiving based on branch by KAlexey
which enables UNIV_LOG_ARCHIVE
* variables names and startup parameters have been changed
  from InnoDB original to be same as were used in previous
  implementation
* archive log files naming has been changed from original
  zero-based sequence (0, 1, 2, 3) to sequence of start lsn
  of archived file. Also prefix has been changed to be
  the same as in previous implementation
* purge commands have been implemented
  (PURGE ARCHIVED LOGS BEFORE/TO)
* innodb_xtra_expire_archive_logs_sec has been implemented
* innodb_xtra_log_archive_throttle has not been implemented
  as not applicable
* testcase has been added (modified from original, as purge
  commands do not delete current archive in progress)

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/37/

[Sergei Glushchenko (sergei.glushchenko)]

Will post couple of questions here
1. This implementation is different from described in https://blueprints.launchpad.net/percona-server/+spec/log-archiving, do we need to disapprove this blueprint and create new one, or just change existing one to describe current implementation?
2. This "I would like to have corresponding binary log position for log archive.
This will allow to have point in time recovery with binary logs." has not been implemented in original implementation and there is no comments about it in previous MP. Do we need this feature?
3. Do we need variable (like have_xtra_log_archiving) to indicate that server has archiving support?
4. Do we really need to be able enable/disable archiving at runtime as BP above describes? We should handle partially written archives somehow in this case.

[Alexey Kopytov (akopytov)]

Hi Sergei,

On Mon, Feb 11 2013 14:17:20 +0400, Sergei Glushchenko wrote:

> Will post couple of questions here
> 1. This implementation is different from described in https://blueprints.launchpad.net/percona-server/+spec/log-archiving, do we need to disapprove this blueprint and create new one, or just change existing one to describe current implementation?

I think just changing the existing one is fine.

> 2. This "I would like to have corresponding binary log position for log archive.
> This will allow to have point in time recovery with binary logs." has not been implemented in original implementation and there is no comments about it in previous MP. Do we need this feature?

Yes, was probably left out from the original implementation. How hard
would it be to implement it?

> 3. Do we need variable (like have_xtra_log_archiving) to indicate that
> server has archiving support?

I don't think so.

> 4. Do we really need to be able enable/disable archiving at runtime as BP above describes? We should handle partially written archives somehow in this case.

I think ability to control it at runtime is good. Partially written
files and gaps in archived files are IMHO a user's problem, i.e. there's
not much _we_ can do to _handle_ them.

--
Best regards,
Alexey.

[Sergei Glushchenko (sergei.glushchenko)]

Alexey,

It's not clear to me how to obtain corresponding binlog position for the LSN at the start of archive. InnoDB know binlog position at transaction commit. And it possible to obtain current binlog position by invoking thd_binlog_pos, but the problem here is that at the moment when we write archived file current LSN might be much further than LSN we write into archive.

Is there any other way to get this?

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/41/

  Implementation of log archiving based on branch by KAlexey
  which enables UNIV_LOG_ARCHIVE
  * variables and startup parameters have following names:
    - innodb_log_archive = ON/OFF
    - innodb_log_arch_dir = DIR
    - innodb_log_arch_expire_sec = N
  * archive log files naming has been changed from original
    zero-based sequence (0, 1, 2, 3) to sequence of start lsn
    of archived file. Also prefix has been changed to be
    the same as in previous implementation
  * purge commands have been implemented
    (PURGE ARCHIVED LOGS BEFORE/TO)
  * innodb_log_arch_expire_sec has been implemented
  * innodb_xtra_log_archive_throttle has not been implemented
    as it is not applicable
  * testcases were implemented

[Vlad Lesin (vlad-lesin)]

Sergey, it seems percona_log_archiving-master.opt is needless because there is no corresponding .test-.result files and at least one option in the .opt file is wrong.

[Vlad Lesin (vlad-lesin)]

It's just partial review:

1. Unused local variable space_arch_log_no in fil_open_single_table_tablespace();
2. I would use "#define IB_ARCHIVED_LOGS_PREFIX_LEN (sizeof(IB_ARCHIVED_LOGS_PREFIX) - 1)" instead of using the number;
3. I don't think it's a good idea to abort the server if the file name does not fit into the buffer in log_archived_file_name_gen(). We could use strncpy() and snprintf() instead of strcpy() and sprintf() and return some value that shows if operation is completed successfully. If it does not some warning should be emitted.

[Sergei Glushchenko (sergei.glushchenko)]

Vlad,

What behavior do you propose for case 3? Server obviously cannot continue operation with given settings. Should log_archiving be turned off (silently or with warning issued to error log)? How can it will be visible to DBA (logs aren't being archived)?

[Vlad Lesin (vlad-lesin)]

> Vlad,
>
> What behavior do you propose for case 3? Server obviously cannot continue
> operation with given settings. Should log_archiving be turned off (silently or
> with warning issued to error log)? How can it will be visible to DBA (logs
> aren't being archived)?

Logs archiving - its a backup feature. I think server must not stop if backup does not work. There should be error in error log with stopped log archiving.

[Vlad Lesin (vlad-lesin)]

I'm testing the latest xtrabackup(lp:percona-xtrabackup) with this server and I have the following issue when I try to do backup:

xtrabackup: uses posix_fadvise().
xtrabackup: cd to /tmp/1/src/data
xtrabackup: Target instance is assumed as followings.
xtrabackup: innodb_data_home_dir = ./
xtrabackup: innodb_data_file_path = ibdata1:10M:autoextend
xtrabackup: innodb_log_group_home_dir = ./
xtrabackup: innodb_log_files_in_group = 2
xtrabackup: innodb_log_file_size = 2097152
130313 0:06:46 InnoDB: Assertion failure in thread 140183767389952 in file fil0fil.c line 5519
InnoDB: Failing assertion: byte_offset % OS_FILE_LOG_BLOCK_SIZE == 0
InnoDB: We intentionally generate a memory trap.
InnoDB: Submit a detailed bug report to http://bugs.mysql.com.
InnoDB: If you get repeated assertion failures or crashes, even
InnoDB: immediately after the mysqld startup, there may be
InnoDB: corruption in the InnoDB tablespace. Please refer to
InnoDB: http://dev.mysql.com/doc/refman/5.5/en/forcing-innodb-recovery.html
InnoDB: about forcing recovery.

I use the following test script to repeat it:
#!/bin/bash

BASE_DIR=/tmp/1/percona-current
DATA_DIR=/tmp/1/src/data
ARCHIVED_LOGS_DIR=/tmp/1/src/archived_logs
BACKUP_DIR=/tmp/1/src/backup
DST_DIR=/tmp/1/dst
XTRABACKUP_DIR=.
XTRABACKUP=$XTRABACKUP_DIR/xtrabackup_55
USER=some_user
EXTRA_OPTIONS="--innodb-file-per-table --innodb_log_file_size=2M"
SERVER_OPTIONS="--innodb_log_archive=ON --innodb_log_arch_dir=$ARCHIVED_LOGS_DIR"
LD_LIBRARY_PATH=$BASE_DIR/lib/mysql:$LD_LIBRARY_PATH
INSTALL_DB=$BASE_DIR/scripts/mysql_install_db
MYSQLD=$BASE_DIR/bin/mysqld
MYSQL=$BASE_DIR/bin/mysql

mkdir -p $DATA_DIR $ARCHIVED_LOGS_DIR $BACKUP_DIR $DST_DIR
rm -rf $DATA_DIR/* $ARCHIVED_LOGS_DIR/* $BACKUP_DIR/* $DST_DIR/*

$INSTALL_DB --no-defaults --basedir=$BASE_DIR --datadir=$DATA_DIR --user=$USER $EXTRA_OPTIONS
PID1=$!
sleep 2
echo '--------------------------after start-----------------------------'
                               ...

[Sergei Glushchenko (sergei.glushchenko)]

Vlad,

So we shouldn't probably fail in case if we cannot write to create new archive file (os_file_create is failed), any problems with IO and so on, which could lead to some nontrivial changes of InnoDB code. Your thoughts?

[Sergei Glushchenko (sergei.glushchenko)]

Xtradb based version are failed with same assertion, however xtrabackup_plugin seems to able to perform backup.

[Alexey Kopytov (akopytov)]

   - multiple lines violate the 80 chars limit, try:

: bzr diff -c-1 | grep -0 '^+ ' | awk 'length > 82'

   - there's still no reply in http://bugs.mysql.com/bug.php?id=68635
     We obviously cannot afford similar changes for every new statement
     type, so we should do something about it. What about adding
     performance_schema_max_statement_classes = 167 to
     mysql-test/include/default_mysqld.cnf?

   - the changes related to digest values is another "gift" from
     performance schema. Not sure what to do about it. Probably just
     "--replace-column ... <digest>" in the corresponding tests?

  - please use OS_FILE_MAX_PATH instead of hard-coded (and
    inconsistent) constants in log_group_archive() and
    log_group_recover_from_archive_file(). I don't think it then makes
    sense to assert on sufficient buffer space, as a lot of things
    would break if paths are longer than that. But you can keep the
    assertion if you like. The rest of InnoDB code seems to assume that
    never happens, but I agree we should fail *if* it does.

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/59/

[Sergei Glushchenko (sergei.glushchenko)]

Failure of XtraDB based xtrabackup binaries is a result of change which comes from innodb_files_extend.patch. This patch uses LOG_CHECKPOINT_ARCHIVED_LSN to store LSN offset of checkpoint within the group, assuming that "UNIV_LOG_ARCHIVE could not be enabled". So this feature is incompatible with any XtraDB based XtraBackup binary. It also should be taken into account when feature will be ported to 5.6.

[Alexey Kopytov (akopytov)]

The part of innodb_files_extend.patch that conflicts with UNIV_LOG_ARCHIVE is support for log files > 4G and thus will not be ported to 5.6, because it is implemented in upstream 5.6, but in a different way and without breaking UNIV_LOG_ARCHIVE.

[Alexey Kopytov (akopytov)]

Sergei,

   Summary of our IRC discussion for the record:
   - test case for bug #1155475
   - unified return types in sql/handler.cc
   - error on bogus filename in innobase_purge_archive_logs()

   Other comments:

   - archived_file_no / next_archived_file_no are now LSNs rather that
     ordinal file numbers. Which means their type should be lsn_t, not
     ulint. The same for 'file_no' argument f
     log_archived_file_name_gen().

   - the assertion and sprintf() in log_archived_file_name_gen() seem to
     assume the maximum length for a decimal representation of file_no
     is 16 characters, but it is a 64-bit integer, so the maximum length
     is 20 characters.

   - the following line in log_archived_file_name_gen() still is still
     longer than 80 chars:

: sprintf(buf + dirnamelen, IB_ARCHIVED_LOGS_PREFIX "%016lu", (ulong) file_no);

   - the following line in log_group_archive() is still longer than 80
     chars:

: n_files * (group->file_size - LOG_FILE_HDR_SIZE),

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

There is an issue with archived file number and archived file offset. These values are written to checkpoint as 4-byte values, however they are naturally 64-bit (type of archived_offset/next_archived_offset should be changed to lsn_t as well).
Possible solution is not to write archived file number to archived file header and to checkpoint. Archived file number is the same as first LSN for archived log file.
I'm going to implement this and look how it goes.

[Sergei Glushchenko (sergei.glushchenko)]

Unfortunately archived file number have to be written to checkpoint. It cannot be calculated using checkpoint LSN as archive may be start by user at any time starting with any LSN. So I introduced two additional 4-byte fields in checkpoint to hold high 4-byte values for archive file number and archive file offset

[Sergei Glushchenko (sergei.glushchenko)]

Alexey,

This is what have been done to address your comments and issues
above

* type of archived_file_no, archived_offset, next_archived_file_no,
  next_archived_offset members of log_group_t has been changed to
  lsn_t
* two additional fields in chechpoint record have been introduced
  to store high 4 bytes of archived file number and offset in
  archived file
* numeric part of archived log file name has been changed to be
  20 characters width, zero padded
* testcase for bug #1155475 has been added
* return types has been changed to my_bool for MySQL handlers,
  and to dberr_t for InnoDB function (PURGE ARCHIVED LOGS commands)
* error on bogus file name has been fixed, check for it has been
  added to appropriate test case

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/65/

[Alexey Kopytov (akopytov)]

Sergei,

Introducing new fields to the on-disk data format doesn't look good.

It looks like we can just avoid using LOG_CHECKPOINT_ARCHIVED_FILE_NO
and LOG_CHECKPOINT_ARCHIVED_OFFSET altogether. Upstream InnoDB code
stores archived_file_no and archived_offset on disk, because it uses
file naming based on ordinal file numbers. So on a restart it has to get
the file number from the checkpoint header to figure out the file _name_
that should be used for further archive writes. It normally doesn't need
the offset, because on a clean restart or when log archiving is
re-enabled, it starts a new file (i.e. with a zero file offset). The
only case when the offset is used is when InnoDB recovers from a
crash. In which case it will proceed with writing to the incompletely
written file starting from archived_offset, so it can eventually write
the file full and mark it as completed.

Now we use LSN-based file naming, so we don't have that problem. With
the new archived_file_no semantics we have archived_lsn =
archived_file_no + archived_offset. We can still maintain them
internally for simplicity, just don't write them to disk.

We have to do more work on a restart though to avoid incompletely
written files in case of a crash:

1. Read archived_lsn from the checkpoint header.
2. Scan innodb_log_arch_dir and find the log file with the maximum LSN
   in its name
3. If no files are found, set archived_file_no to archived_lsn,
   archived_offset to 0 and return (i.e. start a new file)
4. If LOG_FILE_ARCH_COMPLETED in the found file is TRUE (i.e. we are restarting from a
   clean shutdown) do the same as in 3.
5. Assert that archived_lsn lies within the incompletely written file we
   have found (i.e. file_start_lsn + group->file_size > archived_lsn)
6. set archived_file_no to file_start_lsn, archived_offset to
   (archived_lsn - file_start_lsn) and return

Another option would be to give up on the LSN-based file names idea, but
it wouldn't be a complete solution, because as you noted, the offset
should still be a 64-bit value now when log files can be > 4G.

Which means there are actually 2 options: either extend the on-disk
format, or do more work on restart.

Other minor things I noticed when looking at the code:

- too long line:
: IB_ARCHIVED_LOGS_PREFIX, IB_ARCHIVED_LOGS_PREFIX_LEN)) {

- spaces instead of tabs here:

: if (fil_space_contains_node(group->archive_space_id,
: archived_log_filename) ||

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

I understand the reasoning for keeping ondisk format unchanged, but I think proposed algorithm can be made simpler.

Lets suppose we store only file number, but not the offset (we use both current 4-byte file_no and offset for it). After restart, we can read archived file number and archived lsn from checkpoint. So no need to iterate files in directory!. From archived file header we can read start lsn for this file and get offset by using subtraction.

Does it look good?

[Sergei Glushchenko (sergei.glushchenko)]

And, yes, if file doesn't exists, just make assume offset=0

[Alexey Kopytov (akopytov)]

Sergei,

Agree, a combination of a 8-byte archived_file_no and archived_lsn provides us all the information we need and allows to avoid innodb_log_arch_dir scan. Good find!

[Sergei Glushchenko (sergei.glushchenko)]

The proposal above has been implemented.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/69/

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_check.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_check.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_check.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,15 @@
+# Check that there are no gaps in archived files
+
+--source percona_log_archiving_stat.inc
+
+let $lsn = `SELECT (($archived_logs_count - 1) * $LOG_FILE_LSN_STEP + $first_log_file_lsn)`;
+
+if ($last_log_file_lsn != $lsn)
+{
+  echo Expected last file lsn is $lsn but got $last_log_file_lsn;
+  die Test failed;
+}
+
+echo Check OK;
+
+let $LAST_ARCHIVED_LSN = $last_log_file_lsn;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_cleanup.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_cleanup.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_cleanup.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,15 @@
+#
+# Cleanup after log archiving testing
+#
+
+DROP TABLE t;
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --innodb-log-file-size=1M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--remove_files_wildcard $MYSQLD_ARCHIVEDIR ib_log_archive_*
+--rmdir $MYSQLD_ARCHIVEDIR
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_count.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_count.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_count.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,9 @@
+
+--source percona_log_archiving_stat.inc
+
+let $lsn = $n_files * $LOG_FILE_LSN_STEP;
+
+--echo $archived_logs_count
+
+let $LAST_ARCHIVED_LSN = $last_log_file_lsn;
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_last_file.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_last_file.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_last_file.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,24 @@
+
+perl;
+@files = glob($ENV{'MYSQLD_ARCHIVEDIR'}.'/ib_log_archive_*');
+my $filepath, $filename, $dirname;
+foreach my $file (@files) {
+  ($dirname, $filename) = $file =~ m|^(.*[/\\])([^/\\]+?)$|;
+  $filepath = $file;
+}
+
+my @array = stat($filepath);
+my $filemodifytime = $array[9];
+my @t = localtime $filemodifytime;
+my $modifytime = sprintf "%04u-%02u-%02u %02u:%02u:%02u",$t[5]+1900,$t[4]+1,$t[3],$t[2],$t[1],$t[0];
+my $lsn = $filename =~ m/ib_log_archive_0*([1-9][0-9]+)$/;
+open F, ">".$ENV{'MYSQLTEST_VARDIR'}.'/tmp/percona_archived_logs.tmp' or die "Cannot open file percona_archived_logs.tmp for write";
+printf F ("let \$last_log_file = %s;\n", $filename);
+printf F ("let \$last_log_file_modify = %s;\n", $modifytime);
+printf F ("let \$last_log_file_lsn = %s;\n", $lsn);
+close F;
+EOF
+
+--source $MYSQLTEST_VARDIR/tmp/percona_archived_logs.tmp
+# remove_file $MYSQLTEST_VARDIR/tmp/percona_archived_logs.tmp;
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_setup.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_setup.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_setup.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,49 @@
+#
+# setup for log archive testing
+#
+
+
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+# Do something while server is down
+--enable_reconnect
+--exec echo "restart: --innodb_log_archive=ON --innodb_log_arch_dir=logs_archive --innodb-log-file-size=1M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--disable_warnings
+drop table if exists t;
+--enable_warnings
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQLD_ARCHIVEDIR= `SELECT IF( locate('/', @@innodb_log_arch_dir) = 1, @@innodb_log_arch_dir, CONCAT(@@datadir, @@innodb_log_arch_dir))`;
+let MYSQLD_ARCHIVEDIR = $MYSQLD_ARCHIVEDIR;
+--mkdir $MYSQLD_ARCHIVEDIR
+
+let $LOG_FILE_HDR_SIZE = 2048;
+let $LOG_FILE_SIZE = `SELECT @@innodb_log_file_size`;
+let $LOG_FILE_LSN_STEP = `SELECT $LOG_FILE_SIZE - $LOG_FILE_HDR_SIZE`;
+
+create table t (a int not null) ENGINE=InnoDB;
+
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+
+--source percona_log_archiving_stat.inc
+
+let $LAST_ARCHIVED_LSN = $last_log_file_lsn;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_stat.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_stat.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_stat.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,72 @@
+#
+# Collect information about archived log files
+#
+
+perl;
+use Data::Dumper;
+sub fn {
+  my $filepath = shift;
+  my ($dirname, $filename) = $filepath =~ m|^(.*[/\\])([^/\\]+?)$|;
+
+  return $filename;
+}
+
+sub get_file_stat {
+  my $filepath = shift;
+  my $prefix = shift;
+  my $filename = fn($filepath);
+
+  my @array = stat($filepath);
+  my $filemodifytime = $array[9];
+  my @t = localtime $filemodifytime;
+  my $modifytime = sprintf "%04u-%02u-%02u %02u:%02u:%02u",$t[5]+1900,$t[4]+1,$t[3],$t[2],$t[1],$t[0];
+  my ($lsn) = $filename =~ m/ib_log_archive_[0]*([1-9][0-9]+)$/;
+
+  my $f = {
+    'path' => $filepath,
+    'name' => $filename,
+    't' => $filemodifytime,
+    'modifytime' => $modifytime,
+    'lsn' => $lsn
+  };
+
+  return $f;
+}
+
+sub print_file_stat {
+  my %stat = %{$_[0]};
+  my $prefix = $_[1];
+
+  open F, ">>".$ENV{'MYSQLTEST_VARDIR'}.'/tmp/percona_archived_logs.tmp' or die "Cannot open file percona_archived_logs.tmp for write";
+  printf F ("let \$${prefix}_log_file = %s;\n", $stat{'name'});
+  printf F ("let \$${prefix}_log_file_modify = %s;\n", $stat{'modifytime'});
+  printf F ("let \$${prefix}_log_file_lsn = %s;\n", $stat{'lsn'});
+  close F;
+}
+
+@files = glob($ENV{'MYSQLD_ARCHIVEDIR'}.'/ib_log_archive_*');
+
+my @files_stat = ();
+
+foreach my $file (@files) {
+  push(@files_stat, get_file_stat($file));
+}
+
+$count = scalar(@files_stat);
+$mid_n = 1;
+$t = $files_stat[$mid_n]{'t'};
+while (($files_stat[$mid_n]{'t'} == $t) && ($mid_n < $count - 1)) {$mid_n++};
+print_file_stat(@files_stat[0], 'first');
+print_file_stat(@files_stat[-1], 'last');
+print_file_stat(@files_stat[$mid_n - 1], 'mid');
+
+open F, ">>".$ENV{'MYSQLTEST_VARDIR'}.'/tmp/percona_archived_logs.tmp' or die "Cannot open file percona_archived_logs.tmp for write";
+printf F ("let \$archived_logs_count = %s;\n", $count);
+printf F ("let \$archived_logs_mid = %s;\n", $mid_n);
+close F;
+
+EOF
+
+--source $MYSQLTEST_VARDIR/tmp/percona_archived_logs.tmp
+remove_file $MYSQLTEST_VARDIR/tmp/percona_archived_logs.tmp;
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_workload.inc'
--- Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_workload.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/include/percona_log_archiving_workload.inc	2013-03-31 06:25:28 +0000
@@ -0,0 +1,5 @@
+#
+# Perform insert into table to produce some log records
+#
+
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/pecona_bug1155475.result'
--- Percona-Server/mysql-test/suite/innodb/r/pecona_bug1155475.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/pecona_bug1155475.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,23 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+Check OK
+PURGE ARCHIVED LOGS BEFORE NOW();
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_innodb_log_archive_func.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_innodb_log_archive_func.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_innodb_log_archive_func.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,24 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SET GLOBAL innodb_log_archive = OFF;
+Check OK
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SET GLOBAL innodb_log_archive = ON;
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_expire_sec.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_expire_sec.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_expire_sec.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,27 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SET @save_log_arch_expire_sec = @@innodb_log_arch_expire_sec;
+SET GLOBAL innodb_log_arch_expire_sec = 1;
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(4);
+sleep(4)
+0
+SET GLOBAL innodb_log_arch_expire_sec = @save_log_arch_expire_sec;
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_func.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_func.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_log_arch_func.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,21 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+Check OK
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_before.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_before.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_before.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,37 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+Check OK
+PURGE ARCHIVED LOGS BEFORE 'val';
+PURGE ARCHIVED LOGS BEFORE NOW();
+PURGE ARCHIVED LOGS BEFORE DATE_ADD(NOW(), INTERVAL 7 DAY);
+PURGE ARCHIVED LOGS BEFORE 'q';
+ERROR HY000: Unknown error during log purge
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_to.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_to.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_purge_archived_logs_to.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,35 @@
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+drop table if exists t;
+create table t (a int not null) ENGINE=InnoDB;
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13);
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+SELECT sleep(1);
+sleep(1)
+0
+insert into t (a) select t1.a from t t1, t t2, t t3 LIMIT 40000;
+Check OK
+PURGE ARCHIVED LOGS TO 'val';
+PURGE ARCHIVED LOGS TO '#invalid_file';
+ERROR HY000: Unknown error during log purge
+DROP TABLE t;
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/pecona_bug1155475.test'
--- Percona-Server/mysql-test/suite/innodb/t/pecona_bug1155475.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/pecona_bug1155475.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,30 @@
+#
+# Test bug 1155475
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+--source ../include/percona_log_archiving_workload.inc
+--source ../include/percona_log_archiving_check.inc
+
+if ($archived_logs_count == 0)
+{
+  die "0 archived logs have been produced";
+}
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --innodb_log_archive=ON --innodb_log_arch_dir=logs_archive --innodb-log-file-size=1M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+PURGE ARCHIVED LOGS BEFORE NOW();
+
+# server shouldn't crash
+--source ../include/percona_log_archiving_workload.inc
+
+--source ../include/percona_log_archiving_cleanup.inc
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_innodb_log_archive_func.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_innodb_log_archive_func.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_innodb_log_archive_func.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,31 @@
+#
+# Test innodb_log_archive turning ON/OFF at runtime
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+
+--source ../include/percona_log_archiving_workload.inc
+
+SET GLOBAL innodb_log_archive = OFF;
+
+--source ../include/percona_log_archiving_check.inc
+
+let $count = $archived_logs_count;
+
+--source ../include/percona_log_archiving_workload.inc
+
+SET GLOBAL innodb_log_archive = ON;
+
+--source ../include/percona_log_archiving_stat.inc
+
+if ($count != $archived_logs_count)
+{
+  die Test failed. Archived logs being written while innodb_log_archive being turned off.;
+}
+
+--source ../include/percona_log_archiving_cleanup.inc
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_expire_sec.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_expire_sec.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_expire_sec.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,29 @@
+#
+# Test innodb_log_archive_expire_sec
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+SET @save_log_arch_expire_sec = @@innodb_log_arch_expire_sec;
+SET GLOBAL innodb_log_arch_expire_sec = 1;
+
+--source ../include/percona_log_archiving_workload.inc
+
+--source ../include/percona_log_archiving_workload.inc
+
+SELECT sleep(4);
+
+--source ../include/percona_log_archiving_stat.inc
+
+if ($archived_logs_count > 1)
+{
+  die Test failed. Archived logs have nod been purged.;
+}
+
+SET GLOBAL innodb_log_arch_expire_sec = @save_log_arch_expire_sec;
+
+--source ../include/percona_log_archiving_cleanup.inc
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_func.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_func.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_log_arch_func.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,19 @@
+#
+# Test that log archiving is working (produce some files at least)
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+--source ../include/percona_log_archiving_workload.inc
+--source ../include/percona_log_archiving_check.inc
+
+if ($archived_logs_count == 0)
+{
+  die "0 archived logs have been produced";
+}
+
+--source ../include/percona_log_archiving_cleanup.inc
+
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_before.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_before.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_before.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,43 @@
+#
+# Test PURGE ARCHIVED LOGS BEFORE
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+--source ../include/percona_log_archiving_check.inc
+
+if ($archived_logs_count == 0)
+{
+  die "0 archived logs have been produced";
+}
+
+--replace_result $mid_log_file_modify val
+--eval PURGE ARCHIVED LOGS BEFORE '$mid_log_file_modify'
+
+let $count = `SELECT $archived_logs_count - $archived_logs_mid`;
+
+--source ../include/percona_log_archiving_stat.inc
+
+if ($archived_logs_count != $count)
+{
+  die "PURGE ARCHIVED LOGS BEFORE failed";
+}
+
+# check that it works with NOW() and other functions
+PURGE ARCHIVED LOGS BEFORE NOW();
+PURGE ARCHIVED LOGS BEFORE DATE_ADD(NOW(), INTERVAL 7 DAY);
+
+# should fail
+--error 1379
+PURGE ARCHIVED LOGS BEFORE 'q';
+
+--source ../include/percona_log_archiving_cleanup.inc
 
=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_to.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_to.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_purge_archived_logs_to.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,39 @@
+#
+# Test PURGE ARCHIVED LOGS TO
+#
+
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--source ../include/percona_log_archiving_setup.inc
+
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+SELECT sleep(1);
+--source ../include/percona_log_archiving_workload.inc
+--source ../include/percona_log_archiving_check.inc
+
+if ($archived_logs_count == 0)
+{
+  die "0 archived logs have been produced";
+}
+
+--replace_result $mid_log_file val
+--eval PURGE ARCHIVED LOGS TO '$mid_log_file'
+
+let $count = `SELECT $archived_logs_count - $archived_logs_mid + 1`;
+
+--source ../include/percona_log_archiving_stat.inc
+
+if ($archived_logs_count != $count)
+{
+  die "PURGE ARCHIVED LOGS TO failed";
+}
+
+#should fail
+--error 1379
+PURGE ARCHIVED LOGS TO '#invalid_file';
+
+--source ../include/percona_log_archiving_cleanup.inc
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,38 @@
+SELECT @@GLOBAL.innodb_log_arch_dir;
+@@GLOBAL.innodb_log_arch_dir
+./
+NULL Expected
+SET @@GLOBAL.innodb_log_arch_dir=1;
+ERROR HY000: Variable 'innodb_log_arch_dir' is a read only variable
+Expected error 'Read only variable'
+SELECT @@GLOBAL.innodb_log_arch_dir;
+@@GLOBAL.innodb_log_arch_dir
+./
+NULL Expected
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_arch_dir';
+VARIABLE_VALUE
+./
+empty string Expected
+SELECT @@innodb_log_arch_dir;
+@@innodb_log_arch_dir
+./
+NULL Expected
+SELECT @@innodb_log_arch_dir;
+@@innodb_log_arch_dir
+./
+NULL Expected
+SELECT @@local.innodb_log_arch_dir;
+ERROR HY000: Variable 'innodb_log_arch_dir' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@SESSION.innodb_log_arch_dir;
+ERROR HY000: Variable 'innodb_log_arch_dir' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@GLOBAL.innodb_log_arch_dir;
+@@GLOBAL.innodb_log_arch_dir
+./
+NULL Expected
+SELECT innodb_log_arch_dir = @@SESSION.innodb_log_arch_dir;
+ERROR 42S22: Unknown column 'innodb_log_arch_dir' in 'field list'
+Expected error Unknown column 'innodb_log_arch_dir' in 'field list'
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,38 @@
+SELECT @@GLOBAL.innodb_log_arch_expire_sec INTO @save;
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+@@GLOBAL.innodb_log_arch_expire_sec
+0
+0 Expected
+SET @@GLOBAL.innodb_log_arch_expire_sec=1;
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+@@GLOBAL.innodb_log_arch_expire_sec
+1
+1 Expected
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_arch_expire_sec';
+VARIABLE_VALUE
+1
+1 Expected
+SELECT @@innodb_log_arch_expire_sec;
+@@innodb_log_arch_expire_sec
+1
+1 Expected
+SELECT @@innodb_log_arch_expire_sec;
+@@innodb_log_arch_expire_sec
+1
+1 Expected
+SELECT @@local.innodb_log_arch_expire_sec;
+ERROR HY000: Variable 'innodb_log_arch_expire_sec' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@SESSION.innodb_log_arch_expire_sec;
+ERROR HY000: Variable 'innodb_log_arch_expire_sec' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+@@GLOBAL.innodb_log_arch_expire_sec
+1
+1 Expected
+SELECT innodb_log_arch_expire_sec = @@SESSION.innodb_log_arch_expire_sec;
+ERROR 42S22: Unknown column 'innodb_log_arch_expire_sec' in 'field list'
+Expected error Unknown column 'innodb_log_arch_expire_sec' in 'field list'
+SET @@GLOBAL.innodb_log_arch_expire_sec = @save;
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result	2013-03-31 06:25:28 +0000
@@ -0,0 +1,38 @@
+SELECT @@GLOBAL.innodb_log_archive;
+@@GLOBAL.innodb_log_archive
+0
+0 Expected
+SET @save_innodb_log_archive = @@GLOBAL.innodb_log_archive;
+SET @@GLOBAL.innodb_log_archive=1;
+SELECT @@GLOBAL.innodb_log_archive;
+@@GLOBAL.innodb_log_archive
+1
+1 Expected
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_archive';
+VARIABLE_VALUE
+ON
+ON Expected
+SET @@GLOBAL.innodb_log_archive = @save_innodb_log_archive;
+SELECT @@innodb_log_archive;
+@@innodb_log_archive
+0
+0 Expected
+SELECT @@innodb_log_archive;
+@@innodb_log_archive
+0
+0 Expected
+SELECT @@local.innodb_log_archive;
+ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@SESSION.innodb_log_archive;
+ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT @@GLOBAL.innodb_log_archive;
+@@GLOBAL.innodb_log_archive
+0
+0 Expected
+SELECT innodb_log_archive = @@SESSION.innodb_log_archive;
+ERROR 42S22: Unknown column 'innodb_log_archive' in 'field list'
+Expected error Unknown column 'innodb_log_archive' in 'field list'
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_dir_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_dir_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_dir_basic.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,60 @@
+#######################################################
+# Basic test for innodb_log_arch_dir variable #
+#######################################################
+
+--source include/have_innodb.inc
+
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SELECT @@GLOBAL.innodb_log_arch_dir;
+--echo NULL Expected
+
+
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@GLOBAL.innodb_log_arch_dir=1;
+--echo Expected error 'Read only variable'
+
+SELECT @@GLOBAL.innodb_log_arch_dir;
+--echo NULL Expected
+
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_arch_dir';
+--echo empty string Expected
+
+############################################
+#  Check accessing variable without GLOBAL #
+############################################
+SELECT @@innodb_log_arch_dir;
+--echo NULL Expected
+
+
+
+##########################################################################
+#   Check if innodb_log_arch_dir can be accessed without @@ sign #
+##########################################################################
+
+SELECT @@innodb_log_arch_dir;
+--echo NULL Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@local.innodb_log_arch_dir;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.innodb_log_arch_dir;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT @@GLOBAL.innodb_log_arch_dir;
+--echo NULL Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT innodb_log_arch_dir = @@SESSION.innodb_log_arch_dir;
+--echo Expected error Unknown column 'innodb_log_arch_dir' in 'field list'
+
+
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_expire_sec_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_expire_sec_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_arch_expire_sec_basic.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,60 @@
+###############################################################
+# Basic test for innodb_log_arch_expire_sec variable #
+###############################################################
+
+--source include/have_innodb.inc
+
+SELECT @@GLOBAL.innodb_log_arch_expire_sec INTO @save;
+
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+--echo 0 Expected
+
+
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+
+SET @@GLOBAL.innodb_log_arch_expire_sec=1;
+
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+--echo 1 Expected
+
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_arch_expire_sec';
+--echo 1 Expected
+
+############################################
+#  Check accessing variable without GLOBAL #
+############################################
+SELECT @@innodb_log_arch_expire_sec;
+--echo 1 Expected
+
+
+
+##################################################################################
+#   Check if innodb_log_arch_expire_sec can be accessed without @@ sign #
+##################################################################################
+
+SELECT @@innodb_log_arch_expire_sec;
+--echo 1 Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@local.innodb_log_arch_expire_sec;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.innodb_log_arch_expire_sec;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT @@GLOBAL.innodb_log_arch_expire_sec;
+--echo 1 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT innodb_log_arch_expire_sec = @@SESSION.innodb_log_arch_expire_sec;
+--echo Expected error Unknown column 'innodb_log_arch_expire_sec' in 'field list'
+
+SET @@GLOBAL.innodb_log_arch_expire_sec = @save;
 
=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_archive_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_archive_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_archive_basic.test	2013-03-31 06:25:28 +0000
@@ -0,0 +1,61 @@
+###################################################
+# Basic test for innodb_log_archive variable #
+###################################################
+
+--source include/have_innodb.inc
+
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SELECT @@GLOBAL.innodb_log_archive;
+--echo 0 Expected
+
+
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+
+SET @save_innodb_log_archive = @@GLOBAL.innodb_log_archive;
+SET @@GLOBAL.innodb_log_archive=1;
+
+SELECT @@GLOBAL.innodb_log_archive;
+--echo 1 Expected
+
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='innodb_log_archive';
+--echo ON Expected
+
+SET @@GLOBAL.innodb_log_archive = @save_innodb_log_archive;
+
+############################################
+#  Check accessing variable without GLOBAL #
+############################################
+SELECT @@innodb_log_archive;
+--echo 0 Expected
+
+
+
+##########################################################################
+#   Check if innodb_log_archive can be accessed without @@ sign #
+##########################################################################
+
+SELECT @@innodb_log_archive;
+--echo 0 Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@local.innodb_log_archive;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.innodb_log_archive;
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT @@GLOBAL.innodb_log_archive;
+--echo 0 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT innodb_log_archive = @@SESSION.innodb_log_archive;
+--echo Expected error Unknown column 'innodb_log_archive' in 'field list'
+
+
 
=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/handler.cc	2013-03-31 06:25:28 +0000
@@ -6867,6 +6867,48 @@
   return result;
 }
 
+static my_bool purge_archive_logs_handlerton(THD *thd, plugin_ref plugin,
+                                             void *arg)
+{
+  ulong before_timestamp= *(ulong*) arg;
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->purge_archive_logs == NULL)
+    return FALSE;
+
+  return hton->purge_archive_logs(hton, before_timestamp, NULL);
+}
+
+bool ha_purge_archive_logs(THD *thd, handlerton *db_type, void* args)
+{
+  if (db_type == NULL)
+    return plugin_foreach(thd, purge_archive_logs_handlerton,
+                           MYSQL_STORAGE_ENGINE_PLUGIN, args);
+
+  return false;
+}
+
+static my_bool purge_archive_logs_to_handlerton(THD *thd, plugin_ref plugin,
+                                                void *arg)
+{
+  const char* to_filename= (const char*) arg;
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->purge_archive_logs == NULL)
+    return FALSE;
+
+  return hton->purge_archive_logs(hton, 0, to_filename);
+}
+
+bool ha_purge_archive_logs_to(THD *thd, handlerton *db_type, void* args)
+{
+  if (db_type == NULL)
+    return plugin_foreach(thd, purge_archive_logs_to_handlerton,
+                           MYSQL_STORAGE_ENGINE_PLUGIN, args);
+
+  return false;
+}
+
 /*
   Function to check if the conditions for row-based binlogging is
   correct for the table.
 
=== modified file 'Percona-Server/sql/handler.h'
--- Percona-Server/sql/handler.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/handler.h	2013-03-31 06:25:28 +0000
@@ -881,6 +881,9 @@
    int (*fill_is_table)(handlerton *hton, THD *thd, TABLE_LIST *tables, 
                         class Item *cond, 
                         enum enum_schema_tables);
+   bool (*purge_archive_logs)(handlerton *hton, time_t before_date,
+                             const char* to_filename);
+
    uint32 flags;                                /* global handler flags */
    /*
       Those handlerton functions below are properly initialized at handler
@@ -3375,6 +3378,11 @@
 int ha_prepare(THD *thd);
 int ha_recover(HASH *commit_list);
 
+/* remove old archived transaction logs files */
+bool ha_purge_archive_logs(THD *thd, handlerton *db_type, void* args);
+bool ha_purge_archive_logs_to(THD *thd, handlerton *db_type, void* args);
+
+
 /*
  transactions: interface to low-level handlerton functions. These are
  intended to be used by the transaction coordinators to
 
=== modified file 'Percona-Server/sql/lex.h'
--- Percona-Server/sql/lex.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/lex.h	2013-03-31 06:25:28 +0000
@@ -69,6 +69,7 @@
   { "ANALYZE",          SYM(ANALYZE_SYM)}, // this one is for ANALYZE TABLE etc
   { "AND",		SYM(AND_SYM)},
   { "ANY",              SYM(ANY_SYM)},
+  { "ARCHIVED",    SYM(ARCHIVED_SYM)},
   { "AS",		SYM(AS)},
   { "ASC",		SYM(ASC)},
   { "ASCII",		SYM(ASCII_SYM)},
 
=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/mysqld.cc	2013-03-31 06:25:28 +0000
@@ -3418,6 +3418,8 @@
   {"prepare_sql",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_PREPARE]), SHOW_LONG_STATUS},
   {"purge",                (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_PURGE]), SHOW_LONG_STATUS},
   {"purge_before_date",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_PURGE_BEFORE]), SHOW_LONG_STATUS},
+  {"purge_archived",                (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_PURGE_ARCHIVE]), SHOW_LONG_STATUS},
+  {"purge_archived_before_date",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_PURGE_ARCHIVE_BEFORE]), SHOW_LONG_STATUS},
   {"release_savepoint",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RELEASE_SAVEPOINT]), SHOW_LONG_STATUS},
   {"rename_table",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RENAME_TABLE]), SHOW_LONG_STATUS},
   {"rename_user",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RENAME_USER]), SHOW_LONG_STATUS},
 
=== modified file 'Percona-Server/sql/sql_cmd.h'
--- Percona-Server/sql/sql_cmd.h	2012-12-04 08:24:59 +0000
+++ Percona-Server/sql/sql_cmd.h	2013-03-31 06:25:28 +0000
@@ -89,6 +89,8 @@
   SQLCOM_SHOW_RELAYLOG_EVENTS,
   SQLCOM_GET_DIAGNOSTICS,
   SQLCOM_ALTER_USER,
+  SQLCOM_PURGE_ARCHIVE,
+  SQLCOM_PURGE_ARCHIVE_BEFORE,
   /*
     When a command is added here, be sure it's also added in mysqld.cc
     in "struct show_var_st status_vars[]= {" ...
 
=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/sql_parse.cc	2013-03-31 06:25:28 +0000
@@ -2655,6 +2655,49 @@
     res = purge_master_logs_before_date(thd, (ulong)it->val_int());
     break;
   }
+  case SQLCOM_PURGE_ARCHIVE:
+  {
+    if (check_global_access(thd, SUPER_ACL))
+      goto error;
+    /* PURGE ARCHIVED LOGS TO 'file' */
+    if (!ha_purge_archive_logs_to(NULL, NULL, lex->to_log)) {
+      my_ok(thd);
+    } else {
+      my_error(ER_LOG_PURGE_UNKNOWN_ERR, MYF(0), "PURGE ARCHIVE LOGS TO");
+      goto error;
+    }
+
+    break;
+  }
+  case SQLCOM_PURGE_ARCHIVE_BEFORE:
+  {
+    Item *it;
+
+    if (check_global_access(thd, SUPER_ACL))
+      goto error;
+    /* PURGE ARCHIVE LOGS BEFORE 'data' */
+    it= (Item *)lex->value_list.head();
+    if ((!it->fixed && it->fix_fields(lex->thd, &it)) ||
+        it->check_cols(1))
+    {
+      my_error(ER_WRONG_ARGUMENTS, MYF(0), "PURGE ARCHIVE LOGS BEFORE");
+      goto error;
+    }
+    it= new Item_func_unix_timestamp(it);
+    /*
+      it is OK only emulate fix_fieds, because we need only
+      value of constant
+    */
+    it->quick_fix_field();
+    ulong before_timestamp = (ulong)it->val_int();
+    if (!ha_purge_archive_logs(NULL, NULL, &before_timestamp )) {
+      my_ok(thd);
+    } else {
+      my_error(ER_LOG_PURGE_UNKNOWN_ERR, MYF(0), "PURGE ARCHIVE LOGS BEFORE");
+      goto error;
+    }
+    break;
+  }
 #endif
   case SQLCOM_SHOW_WARNS:
   {
 
=== modified file 'Percona-Server/sql/sql_yacc.yy'
--- Percona-Server/sql/sql_yacc.yy	2013-03-05 12:46:43 +0000
+++ Percona-Server/sql/sql_yacc.yy	2013-03-31 06:25:28 +0000
@@ -1064,6 +1064,7 @@
 %token  AND_AND_SYM                   /* OPERATOR */
 %token  AND_SYM                       /* SQL-2003-R */
 %token  ANY_SYM                       /* SQL-2003-R */
+%token  ARCHIVED_SYM                  /* MYSQL      */
 %token  AS                            /* SQL-2003-R */
 %token  ASC                           /* SQL-2003-N */
 %token  ASCII_SYM                     /* MYSQL-FUNC */
@@ -12942,7 +12943,8 @@
         ;
 
 purge_options:
-          master_or_binary LOGS_SYM purge_option
+          ARCHIVED_SYM LOGS_SYM purge_archive_option
+          | master_or_binary LOGS_SYM purge_option
         ;
 
 purge_option:
@@ -12959,6 +12961,21 @@
           }
         ;
 
+purge_archive_option:
+          TO_SYM TEXT_STRING_sys
+          {
+            Lex->to_log = $2.str;
+            Lex->sql_command= SQLCOM_PURGE_ARCHIVE;
+          }
+        | BEFORE_SYM expr
+          {
+            LEX *lex= Lex;
+            lex->value_list.empty();
+            lex->value_list.push_front($2);
+            lex->sql_command= SQLCOM_PURGE_ARCHIVE_BEFORE;
+          }
+        ;
+
 /* kill threads */
 
 kill:
@@ -14080,6 +14097,7 @@
         | AGGREGATE_SYM            {}
         | ALGORITHM_SYM            {}
         | ANALYSE_SYM              {}
+        | ARCHIVED_SYM             {}
         | ANY_SYM                  {}
         | AT_SYM                   {}
         | AUTO_INC                 {}
 
=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.cc'
--- Percona-Server/storage/innobase/fil/fil0fil.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.cc	2013-03-31 06:25:28 +0000
@@ -1211,6 +1211,39 @@
 
 	mutex_exit(&fil_system->mutex);
 }
+
+/****************************************************************//**
+Check is there node in file space with given name. */
+UNIV_INTERN
+ibool
+fil_space_contains_node(
+/*====================*/
+	ulint	id,		/*!< in: space id */
+	char*	node_name)	/*!< in: node name */
+{
+	fil_node_t*	node;
+	fil_space_t*	space;
+
+	mutex_enter(&fil_system->mutex);
+
+	space = fil_space_get_by_id(id);
+
+	ut_a(space);
+
+	for (node = UT_LIST_GET_FIRST(space->chain); node != NULL;
+	     node = UT_LIST_GET_NEXT(chain, node)) {
+
+		if (ut_strcmp(node->name, node_name) == 0) {
+			mutex_exit(&fil_system->mutex);
+			return(TRUE);
+		}
+
+	}
+
+	mutex_exit(&fil_system->mutex);
+	return(FALSE);
+}
+
 #endif /* UNIV_LOG_ARCHIVE */
 
 /*******************************************************************//**
@@ -1942,12 +1975,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
@@ -1976,10 +2003,7 @@
 	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;
 	}
 
@@ -1989,14 +2013,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 ==========================*/
@@ -3499,9 +3515,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 */
 };
 
 /********************************************************************//**
@@ -3637,9 +3650,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,
@@ -3661,9 +3671,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,
@@ -3686,9 +3693,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,
@@ -3916,9 +3920,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) {
 
=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-03-31 06:25:28 +0000
@@ -989,6 +989,32 @@
 					 name to lower case */
 
 /*************************************************************//**
+Removes old archived transaction log files.
+@return	true on error */
+static bool innobase_purge_archive_logs(
+	handlerton *hton,		/*!< in: InnoDB handlerton */
+	time_t before_date,		/*!< in: all files modified
+					before timestamp should be removed */
+	const char* to_filename)	/*!< in: this and earler files
+					should be removed */
+{
+	ulint err= DB_ERROR;
+	if (before_date > 0) {
+		err= purge_archived_logs(before_date, 0);
+	} else if (to_filename) {
+		if (is_prefix(to_filename, IB_ARCHIVED_LOGS_PREFIX)) {
+			unsigned long long log_file_lsn = strtoll(to_filename
+					+ IB_ARCHIVED_LOGS_PREFIX_LEN,
+					NULL, 10);
+			if (log_file_lsn > 0 && log_file_lsn < ULLONG_MAX) {
+				err= purge_archived_logs(0, log_file_lsn);
+			}
+		}
+	}
+	return (err != DB_SUCCESS);
+}
+
+/*************************************************************//**
 Check for a valid value of innobase_commit_concurrency.
 @return	0 for valid innodb_commit_concurrency */
 static
@@ -2760,6 +2786,7 @@
 
 	innobase_hton->release_temporary_latches =
 		innobase_release_temporary_latches;
+	innobase_hton->purge_archive_logs = innobase_purge_archive_logs;
 
 	innobase_hton->data = &innodb_api_cb;
 
@@ -2862,12 +2889,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 */
 
@@ -13684,6 +13708,45 @@
 }
 
 /****************************************************************//**
+Update the system variable innodb_log_arch_expire_sec using
+the "saved" value. This function is registered as a callback with MySQL. */
+static
+void
+innodb_log_archive_expire_update(
+/*==============================*/
+	THD*				thd,		/*!< in: thread handle */
+	struct st_mysql_sys_var*	var,		/*!< in: pointer to
+							system variable */
+	void*				var_ptr,	/*!< out: unused */
+	const void*			save)		/*!< in: immediate result
+							from check function */
+{
+	srv_log_arch_expire_sec = *(ulint*) save;
+}
+
+static
+void
+innodb_log_archive_update(
+/*======================*/
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				var_ptr,
+	const void*			save)
+{
+	my_bool	in_val = *static_cast<const my_bool*>(save);
+
+	if (in_val) {
+		/* turn archiving on */
+		srv_log_archive_on = innobase_log_archive = 1;
+		log_archive_archivelog();
+	} else {
+		/* turn archivng off */
+		srv_log_archive_on = innobase_log_archive = 0;
+		log_archive_noarchivelog();
+	}
+}
+
+/****************************************************************//**
 Update the system variable innodb_max_dirty_pages_pct using the "saved"
 value. This function is registered as a callback with MySQL. */
 static
@@ -15486,14 +15549,20 @@
   "Where full logs should be archived.", NULL, NULL, NULL);
 
 static MYSQL_SYSVAR_BOOL(log_archive, innobase_log_archive,
-  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
-  "Set to 1 if you want to have logs archived.", NULL, NULL, FALSE);
+  PLUGIN_VAR_OPCMDARG,
+  "Set to 1 if you want to have logs archived.",
+  NULL, innodb_log_archive_update, FALSE);
 #endif /* UNIV_LOG_ARCHIVE */
 
 static MYSQL_SYSVAR_STR(log_group_home_dir, srv_log_group_home_dir,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Path to InnoDB log files.", NULL, NULL, NULL);
 
+static MYSQL_SYSVAR_ULONG(log_arch_expire_sec,
+  srv_log_arch_expire_sec, PLUGIN_VAR_OPCMDARG,
+  "Expiration time for archived innodb transaction logs.",
+  NULL, innodb_log_archive_expire_update, 0, 0, ~0L, 0);
+
 static MYSQL_SYSVAR_ULONG(max_dirty_pages_pct, srv_max_buf_pool_modified_pct,
   PLUGIN_VAR_RQCMDARG,
   "Percentage of dirty pages allowed in bufferpool.",
@@ -16140,6 +16209,7 @@
 #ifdef UNIV_LOG_ARCHIVE
   MYSQL_SYSVAR(log_arch_dir),
   MYSQL_SYSVAR(log_archive),
+  MYSQL_SYSVAR(log_arch_expire_sec),
 #endif /* UNIV_LOG_ARCHIVE */
   MYSQL_SYSVAR(page_size),
   MYSQL_SYSVAR(log_buffer_size),
 
=== modified file 'Percona-Server/storage/innobase/include/fil0fil.h'
--- Percona-Server/storage/innobase/include/fil0fil.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/include/fil0fil.h	2013-03-31 06:25:28 +0000
@@ -229,6 +229,14 @@
 	ulint	trunc_len);	/*!< in: truncate by this much; it is an error
 				if this does not equal to the combined size of
 				some initial files in the space */
+/****************************************************************//**
+Check is there node in file space with given name. */
+UNIV_INTERN
+ibool
+fil_space_contains_node(
+/*====================*/
+	ulint	id,		/*!< in: space id */
+	char*	node_name);	/*!< in: node name */
 #endif /* UNIV_LOG_ARCHIVE */
 /*******************************************************************//**
 Creates a space memory object and puts it to the 'fil system' hash table.
@@ -371,12 +379,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
 
=== modified file 'Percona-Server/storage/innobase/include/log0log.h'
--- Percona-Server/storage/innobase/include/log0log.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/include/log0log.h	2013-03-31 06:25:28 +0000
@@ -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 */
@@ -283,8 +287,7 @@
 /*==============================*/
 	const byte*	buf,	/*!< in: buffer containing checkpoint info */
 	ulint		n,	/*!< in: nth slot */
-	ulint*		file_no,/*!< out: archived file number */
-	ulint*		offset);/*!< out: archived file offset */
+	lsn_t*		file_no);/*!< out: archived file number */
 /******************************************************//**
 Writes checkpoint info to groups. */
 UNIV_INTERN
@@ -340,8 +343,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
@@ -736,19 +749,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
 
=== modified file 'Percona-Server/storage/innobase/include/log0recv.h'
--- Percona-Server/storage/innobase/include/log0recv.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/include/log0recv.h	2013-03-31 06:25:28 +0000
@@ -297,14 +297,14 @@
 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
 					possible */
-	ulint		first_log_no);	/*!< in: number of the first archived
+	lsn_t		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
 
=== modified file 'Percona-Server/storage/innobase/include/srv0srv.h'
--- Percona-Server/storage/innobase/include/srv0srv.h	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/include/srv0srv.h	2013-03-31 06:25:28 +0000
@@ -348,6 +348,8 @@
 extern ulong	srv_doublewrite_batch_size;
 extern ulong	srv_checksum_algorithm;
 
+extern ulong	srv_log_arch_expire_sec;
+
 extern ulong	srv_max_buf_pool_modified_pct;
 extern ulong	srv_max_purge_lag;
 extern ulong	srv_max_purge_lag_delay;
@@ -651,6 +653,18 @@
 void
 srv_export_innodb_status(void);
 /*==========================*/
+/*************************************************************//**
+Removes old archived transaction log files.
+Both parameters couldn't be provided at the same time.
+@return DB_SUCCESS on success, otherwise DB_ERROR */
+UNIV_INTERN
+dberr_t
+purge_archived_logs(
+	time_t	before_date,		/*!< in: all files modified
+					before timestamp should be removed */
+	lsn_t	before_lsn);		/*!< in: files with this lsn in name
+					and earler should be removed */
+/*==========================*/
 /*******************************************************************//**
 Get current server activity count. We don't hold srv_sys::mutex while
 reading this value as it is only used in heuristics.
 
=== modified file 'Percona-Server/storage/innobase/include/univ.i'
--- Percona-Server/storage/innobase/include/univ.i	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/include/univ.i	2013-03-31 06:25:28 +0000
@@ -46,6 +46,9 @@
 #define INNODB_VERSION_MINOR	2
 #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:
 
=== modified file 'Percona-Server/storage/innobase/log/log0log.cc'
--- Percona-Server/storage/innobase/log/log0log.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/log/log0log.cc	2013-03-31 06:25:28 +0000
@@ -817,15 +817,11 @@
 	rw_lock_create(archive_lock_key, &log_sys->archive_lock,
 		       SYNC_NO_ORDER_CHECK);
 
-	log_sys->archive_buf = NULL;
-
-	/* ut_align(
-	ut_malloc(LOG_ARCHIVE_BUF_SIZE
-	+ OS_FILE_LOG_BLOCK_SIZE),
-	OS_FILE_LOG_BLOCK_SIZE); */
-	log_sys->archive_buf_size = 0;
-
-	/* memset(log_sys->archive_buf, '\0', LOG_ARCHIVE_BUF_SIZE); */
+	log_sys->archive_buf = static_cast<byte*>(
+		ut_align(mem_zalloc(LOG_ARCHIVE_BUF_SIZE
+				    + OS_FILE_LOG_BLOCK_SIZE),
+			 OS_FILE_LOG_BLOCK_SIZE));
+	log_sys->archive_buf_size = LOG_ARCHIVE_BUF_SIZE;
 
 	log_sys->archiving_on = os_event_create();
 #endif /* UNIV_LOG_ARCHIVE */
@@ -896,10 +892,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 +920,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 */
 
@@ -1708,15 +1704,13 @@
 /*==============================*/
 	byte*	buf,	/*!< in: buffer for checkpoint info */
 	ulint	n,	/*!< in: nth slot */
-	ulint	file_no,/*!< in: archived file number */
-	ulint	offset)	/*!< in: archived file offset */
+	lsn_t	file_no)/*!< in: archived file number */
 {
 	ut_ad(n < LOG_MAX_N_GROUPS);
 
-	mach_write_to_4(buf + LOG_CHECKPOINT_GROUP_ARRAY
-			+ 8 * n + LOG_CHECKPOINT_ARCHIVED_FILE_NO, file_no);
-	mach_write_to_4(buf + LOG_CHECKPOINT_GROUP_ARRAY
-			+ 8 * n + LOG_CHECKPOINT_ARCHIVED_OFFSET, offset);
+	mach_write_to_8(buf + LOG_CHECKPOINT_GROUP_ARRAY +
+			8 * n + LOG_CHECKPOINT_ARCHIVED_FILE_NO,
+			file_no);
 }
 
 /*******************************************************************//**
@@ -1727,15 +1721,12 @@
 /*==============================*/
 	const byte*	buf,	/*!< in: buffer containing checkpoint info */
 	ulint		n,	/*!< in: nth slot */
-	ulint*		file_no,/*!< out: archived file number */
-	ulint*		offset)	/*!< out: archived file offset */
+	lsn_t*		file_no)/*!< out: archived file number */
 {
 	ut_ad(n < LOG_MAX_N_GROUPS);
 
-	*file_no = mach_read_from_4(buf + LOG_CHECKPOINT_GROUP_ARRAY
-				    + 8 * n + LOG_CHECKPOINT_ARCHIVED_FILE_NO);
-	*offset = mach_read_from_4(buf + LOG_CHECKPOINT_GROUP_ARRAY
-				   + 8 * n + LOG_CHECKPOINT_ARCHIVED_OFFSET);
+	*file_no = mach_read_from_8(buf + LOG_CHECKPOINT_GROUP_ARRAY +
+				8 * n + LOG_CHECKPOINT_ARCHIVED_FILE_NO);
 }
 
 /******************************************************//**
@@ -1795,7 +1786,7 @@
 #endif /* UNIV_LOG_ARCHIVE */
 
 	for (i = 0; i < LOG_MAX_N_GROUPS; i++) {
-		log_checkpoint_set_nth_group_info(buf, i, 0, 0);
+		log_checkpoint_set_nth_group_info(buf, i, 0);
 	}
 
 	group2 = UT_LIST_GET_FIRST(log_sys->log_groups);
@@ -1803,10 +1794,9 @@
 	while (group2) {
 		log_checkpoint_set_nth_group_info(buf, group2->id,
 #ifdef UNIV_LOG_ARCHIVE
-						  group2->archived_file_no,
-						  group2->archived_offset
+						  group2->archived_file_no
 #else /* UNIV_LOG_ARCHIVE */
-						  0, 0
+						  0
 #endif /* UNIV_LOG_ARCHIVE */
 						  );
 
@@ -2225,7 +2215,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;
@@ -2244,12 +2234,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;
 }
 
 /******************************************************//**
@@ -2261,7 +2307,7 @@
 	log_group_t*	group,		/*!< in: log group */
 	ulint		nth_file,	/*!< in: header to the nth file in the
 					archive log file space */
-	ulint		file_no,	/*!< in: archived file number */
+	lsn_t		file_no,	/*!< in: archived file number */
 	ib_uint64_t	start_lsn)	/*!< in: log file data starts at this
 					lsn */
 {
@@ -2287,6 +2333,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,
@@ -2322,6 +2369,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,
@@ -2340,7 +2388,7 @@
 	os_file_t	file_handle;
 	lsn_t		start_lsn;
 	lsn_t		end_lsn;
-	char		name[1024];
+	char		name[OS_FILE_MAX_PATH];
 	byte*		buf;
 	ulint		len;
 	ibool		ret;
@@ -2372,12 +2420,19 @@
 
 		if (next_offset % group->file_size == 0) {
 			open_mode = OS_FILE_CREATE;
+			if (n_files == 0) {
+				/* Adjust archived_file_no to match start_lsn
+				   which is written in file header as well */
+				group->archived_file_no = start_lsn;
+			}
 		} else {
 			open_mode = OS_FILE_OPEN;
 		}
 
-		log_archived_file_name_gen(name, group->id,
-					   group->archived_file_no + n_files);
+		log_archived_file_name_gen(name, sizeof(name), group->id,
+					   group->archived_file_no +
+					   n_files * (group->file_size -
+					   LOG_FILE_HDR_SIZE));
 
 		file_handle = os_file_create(innodb_file_log_key,
 					     name, open_mode,
@@ -2414,13 +2469,14 @@
 
 		/* Add the archive file as a node to the space */
 
-		fil_node_create(name, group->file_size / UNIV_PAGE_SIZE,
-				group->archive_space_id, FALSE);
+		ut_a(fil_node_create(name, group->file_size / UNIV_PAGE_SIZE,
+				     group->archive_space_id, FALSE));
 
 		if (next_offset % group->file_size == 0) {
 			log_group_archive_file_header_write(
 				group, n_files,
-				group->archived_file_no + n_files,
+				group->archived_file_no +
+				n_files * (group->file_size - LOG_FILE_HDR_SIZE),
 				start_lsn);
 
 			next_offset += LOG_FILE_HDR_SIZE;
@@ -2451,6 +2507,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,
@@ -2469,7 +2526,8 @@
 		goto loop;
 	}
 
-	group->next_archived_file_no = group->archived_file_no + n_files;
+	group->next_archived_file_no = group->archived_file_no +
+			n_files * (group->file_size - LOG_FILE_HDR_SIZE);
 	group->next_archived_offset = next_offset % group->file_size;
 
 	ut_a(group->next_archived_offset % OS_FILE_LOG_BLOCK_SIZE == 0);
@@ -2501,7 +2559,7 @@
 /*===================================*/
 {
 	log_group_t*	group;
-	ulint		end_offset;
+	lsn_t		end_offset;
 	ulint		trunc_files;
 	ulint		n_files;
 	ib_uint64_t	start_lsn;
@@ -2822,18 +2880,8 @@
 					 trunc_len);
 		if (increment_file_count) {
 			group->archived_offset = 0;
-			group->archived_file_no += 2;
 		}
 
-#ifdef UNIV_DEBUG
-		if (log_debug_writes) {
-			fprintf(stderr,
-				"Incrementing arch file no to %lu"
-				" in log group %lu\n",
-				(ulong) group->archived_file_no + 2,
-				(ulong) group->id);
-		}
-#endif /* UNIV_DEBUG */
 	}
 }
 
@@ -3087,7 +3135,6 @@
 /*=======================================*/
 {
 	lsn_t			lsn;
-	ulint			arch_log_no;
 	ulint			count = 0;
 	ulint			total_trx;
 	ulint			pending_io;
@@ -3304,15 +3351,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 */
@@ -3371,7 +3410,7 @@
 	srv_shutdown_lsn = lsn;
 
 	if (!srv_read_only_mode) {
-		fil_write_flushed_lsn_to_data_files(lsn, arch_log_no);
+		fil_write_flushed_lsn_to_data_files(lsn, 0);
 
 		fil_flush_file_spaces(FIL_TABLESPACE);
 	}
@@ -3594,7 +3633,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
 
=== modified file 'Percona-Server/storage/innobase/log/log0recv.cc'
--- Percona-Server/storage/innobase/log/log0recv.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/log/log0recv.cc	2013-03-31 06:25:28 +0000
@@ -3115,8 +3115,10 @@
 
 	while (group) {
 		log_checkpoint_get_nth_group_info(buf, group->id,
-						  &(group->archived_file_no),
-						  &(group->archived_offset));
+						  &(group->archived_file_no));
+
+		log_archived_get_offset(group, group->archived_file_no,
+			archived_lsn, &(group->archived_offset));
 
 		group = UT_LIST_GET_NEXT(log_groups, group);
 	}
@@ -3690,7 +3692,7 @@
 	os_offset_t	read_offset;
 	os_offset_t	file_size;
 	int		input_char;
-	char		name[10000];
+	char		name[OS_FILE_MAX_PATH];
 
 	ut_a(0);
 
@@ -3699,7 +3701,8 @@
 
 	/* 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,
@@ -3748,20 +3751,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);
@@ -3828,7 +3830,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(
@@ -3863,14 +3865,14 @@
 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
 					possible */
-	ulint		first_log_no)	/*!< in: number of the first archived
+	lsn_t		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
@@ -3880,7 +3882,7 @@
 	ulint		group_id;
 	ulint		trunc_len;
 	ibool		ret;
-	ulint		err;
+	dberr_t		err;
 
 	ut_a(0);
 
@@ -3939,7 +3941,7 @@
 						 trunc_len);
 		}
 
-		group->archived_file_no++;
+		group->archived_file_no += group->file_size - LOG_FILE_HDR_SIZE;
 	}
 
 	if (recv_sys->recovered_lsn < limit_lsn) {
 
=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.cc'
--- Percona-Server/storage/innobase/srv/srv0srv.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.cc	2013-03-31 06:25:28 +0000
@@ -67,6 +67,7 @@
 #include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
 #include "srv0mon.h"
 #include "ut0crc32.h"
+#include "os0file.h"
 
 #include "mysql/plugin.h"
 #include "mysql/service_thd_wait.h"
@@ -111,6 +112,7 @@
 
 #ifdef UNIV_LOG_ARCHIVE
 UNIV_INTERN char*	srv_arch_dir	= NULL;
+UNIV_INTERN ulong	srv_log_arch_expire_sec	= 0;
 #endif /* UNIV_LOG_ARCHIVE */
 
 /** Set if InnoDB must operate in read-only mode. We don't do any
@@ -1852,6 +1854,134 @@
 	return(thread_active);
 }
 
+/*************************************************************//**
+Removes old archived transaction log files.
+Both parameters couldn't be provided at the same time */
+dberr_t
+purge_archived_logs(
+	time_t	before_date,		/*!< in: all files modified
+					before timestamp should be removed */
+	lsn_t	before_no)		/*!< in: files with this number in name
+					and earler should be removed */
+{
+	log_group_t*	group = UT_LIST_GET_FIRST(log_sys->log_groups);
+
+	os_file_dir_t	dir;
+	os_file_stat_t	fileinfo;
+	char		archived_log_filename[OS_FILE_MAX_PATH];
+	char		namegen[OS_FILE_MAX_PATH];
+	ulint		dirnamelen;
+
+	if (srv_arch_dir) {
+		dir = os_file_opendir(srv_arch_dir, FALSE);
+		if (!dir) {
+			fprintf(stderr,
+				"InnoDB: Note: opening archived log directory "
+				"%s failed. "
+				"Purge archived logs are not available\n",
+				srv_arch_dir);
+			/* failed to open directory */
+			return(DB_ERROR);
+		}
+	} else {
+		/* log archive directory is not specified */
+		return(DB_ERROR);
+	}
+
+	dirnamelen = strlen(srv_arch_dir);
+
+	memcpy(archived_log_filename, srv_arch_dir, dirnamelen);
+	if (dirnamelen &&
+		archived_log_filename[dirnamelen - 1] != SRV_PATH_SEPARATOR) {
+		archived_log_filename[dirnamelen++] = SRV_PATH_SEPARATOR;
+	}
+
+	memset(&fileinfo, 0, sizeof(fileinfo));
+	while(!os_file_readdir_next_file(srv_arch_dir, dir,
+				&fileinfo) ) {
+		if (strncmp(fileinfo.name,
+			IB_ARCHIVED_LOGS_PREFIX, IB_ARCHIVED_LOGS_PREFIX_LEN)) {
+			continue;
+		}
+		if (dirnamelen + strlen(fileinfo.name) + 2 > OS_FILE_MAX_PATH)
+			continue;
+
+		snprintf(archived_log_filename + dirnamelen, OS_FILE_MAX_PATH,
+				"%s", fileinfo.name);
+
+		if (before_no) {
+			ib_uint64_t log_file_no = strtoull(fileinfo.name +
+					IB_ARCHIVED_LOGS_PREFIX_LEN,
+					NULL, 10);
+			if (log_file_no == 0 || before_no <= log_file_no) {
+				continue;
+			}
+		} else {
+			fileinfo.mtime = 0;
+			if (os_file_get_status(archived_log_filename,
+					&fileinfo, false) != DB_SUCCESS ||
+					fileinfo.mtime == 0) {
+				continue;
+			}
+
+			if (before_date == 0 || fileinfo.mtime > before_date) {
+				continue;
+			}
+		}
+
+		/* We are going to delete archived file. Acquire log_sys->mutex
+		to make sure that we are the only who try to delete file. This
+		also prevents log system from using this file. Do not delete
+		file if it is currently in progress of writting or have
+		pending IO. This is enforced by checking:
+		  1. fil_space_contains_node.
+		  2. group->archived_offset % group->file_size != 0, i.e. 
+		     there is archive in progress and we are going to delete it.
+		This covers 3 cases:
+		  a. Usual case when we have one archive in progress,
+		     both 1 and 2 are TRUE
+		  b. When we have more then 1 archive in fil_space,
+		     this can happen when flushed LSN range crosses file
+		     boundary
+		  c. When we have empty fil_space, but existing file will be
+		     opened once archiving operation is requested. This usually
+		     happens on startup.
+		*/
+
+		mutex_enter(&log_sys->mutex);
+
+		log_archived_file_name_gen(namegen, sizeof(namegen),
+					   group->id, group->archived_file_no);
+
+		if (fil_space_contains_node(group->archive_space_id,
+					    archived_log_filename) ||
+		    (group->archived_offset % group->file_size != 0 &&
+		     strcmp(namegen, archived_log_filename) == 0)) {
+
+			mutex_exit(&log_sys->mutex);
+			continue;
+		}
+
+		if (os_file_delete_if_exists(archived_log_filename) == FALSE) {
+			fprintf(stderr,
+				"InnoDB: Note: can't delete archived log file "
+				"%s.\n", archived_log_filename);
+
+			mutex_exit(&log_sys->mutex);
+			os_file_closedir(dir);
+
+			return(DB_ERROR);
+		}
+
+		mutex_exit(&log_sys->mutex);
+	}
+
+	os_file_closedir(dir);
+
+	return(DB_SUCCESS);
+}
+
+
 /*******************************************************************//**
 Tells the InnoDB server that there has been activity in the database
 and wakes up the master thread if it is suspended (not sleeping). Used
@@ -2205,6 +2335,16 @@
 	log_checkpoint(TRUE, FALSE);
 	MONITOR_INC_TIME_IN_MICRO_SECS(MONITOR_SRV_CHECKPOINT_MICROSECOND,
 				       counter_time);
+
+	if (srv_shutdown_state > 0) {
+		return;
+	}
+
+	if (srv_log_arch_expire_sec) {
+		srv_main_thread_op_info = "purging archived logs";
+		purge_archived_logs(ut_time() - srv_log_arch_expire_sec,
+				0);
+	}
 }
 
 /*********************************************************************//**
 
=== modified file 'Percona-Server/storage/innobase/srv/srv0start.cc'
--- Percona-Server/storage/innobase/srv/srv0start.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/storage/innobase/srv/srv0start.cc	2013-03-31 06:25:28 +0000
@@ -640,6 +640,11 @@
 		}
 	}
 
+#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,
@@ -650,7 +655,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,9 +748,9 @@
 	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
+	lsn_t*		min_arch_log_no,/*!< out: min of archived log
 					numbers in data files */
-	ulint*		max_arch_log_no,/*!< out: max of archived log
+	lsn_t*		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
@@ -963,9 +973,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
@@ -1443,8 +1450,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;
@@ -1883,17 +1890,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
@@ -1982,7 +1978,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);
@@ -2462,6 +2457,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;