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

=== modified file 'Percona-Server/mysql-test/include/default_mysqld_autosize.cnf'
--- Percona-Server/mysql-test/include/default_mysqld_autosize.cnf	2012-05-30 11:44:42 +0000
+++ Percona-Server/mysql-test/include/default_mysqld_autosize.cnf	2013-03-20 16:30:32 +0000
@@ -42,6 +42,9 @@
 log-bin=mysqld-bin
 
 # No performance schema sizing provided
+# Except the max-statement-classes which is set to default value of 167
+# as a workaround of http://bugs.mysql.com/bug.php?id=68635
+loose-performance-schema-max-statement-classes=167
 
 # Disable everything, we only need the sizing data,
 # and also need a stable output for show engine performance_schema status
 
=== 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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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/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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +0000
@@ -0,0 +1,36 @@
+#
+# 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";
+}
+
+--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-20 16:30:32 +0000
@@ -0,0 +1,36 @@
+#
+# 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";
+}
+
+--source ../include/percona_log_archiving_cleanup.inc
+
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/digest_table_full.result'
--- Percona-Server/mysql-test/suite/perfschema/r/digest_table_full.result	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/digest_table_full.result	2013-03-20 16:30:32 +0000
@@ -112,8 +112,8 @@
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-NULL	NULL	NULL	55	32	1	2
-statements_digest	e4a84a547a18a89f4708509a720def58	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
+NULL	?	NULL	55	32	1	2
+statements_digest	?	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
 SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/ortho_iter.result'
--- Percona-Server/mysql-test/suite/perfschema/r/ortho_iter.result	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/ortho_iter.result	2013-03-20 16:30:32 +0000
@@ -91,64 +91,6 @@
 signal sqlstate '01000' set message_text='Done', mysql_errno=12000;
 end
 $
-show variables like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 call check_instrument("wait/synch/mutex/");
 instr_name	is_wait	is_stage	is_statement
 wait/synch/mutex/	1	0	0
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/rpl_gtid_func.result'
--- Percona-Server/mysql-test/suite/perfschema/r/rpl_gtid_func.result	2012-11-08 21:40:31 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/rpl_gtid_func.result	2013-03-20 16:30:32 +0000
@@ -40,7 +40,7 @@
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-8d588d616712c7d8dfabf22ce262662b	SELECT ? AS in_master_digest 	1
+?	SELECT ? AS in_master_digest 	1
 insert into test.marker values (2);
 **** On Slave ****
 select * from test.marker;
@@ -67,7 +67,7 @@
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-02e25175edc3b2834b9b41d58f5a8a6a	SELECT ? AS in_slave_digest 	1
+?	SELECT ? AS in_slave_digest 	1
 **** On Master ****
 delete from performance_schema.setup_objects
 where object_schema='master';
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/start_server_innodb.result'
--- Percona-Server/mysql-test/suite/perfschema/r/start_server_innodb.result	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/start_server_innodb.result	2013-03-20 16:30:32 +0000
@@ -104,28 +104,3 @@
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/start_server_on.result'
--- Percona-Server/mysql-test/suite/perfschema/r/start_server_on.result	2012-12-04 08:24:59 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/start_server_on.result	2013-03-20 16:30:32 +0000
@@ -104,28 +104,3 @@
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/statement_digest.result'
--- Percona-Server/mysql-test/suite/perfschema/r/statement_digest.result	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/statement_digest.result	2013-03-20 16:30:32 +0000
@@ -112,43 +112,43 @@
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-statements_digest	e4a84a547a18a89f4708509a720def58	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
-statements_digest	ab105aea9c15b3842ad161d18349f9c4	SELECT ? FROM t1 	1	0	0	0
-statements_digest	835083efbaa5d8c29d01d558abb8216b	SELECT ? FROM `t1` 	1	0	0	0
-statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2	0	0	0
-statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1	0	0	0
-statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2	0	0	0
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1	1	0	0
-statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1	1	0	0
-statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4	4	0	0
-statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1	1	0	0
-statements_digest	b201a20a2a534d2789750270b7f90fab	INSERT INTO t5 VALUES (...) 	1	1	0	0
-statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2	7	0	0
-statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1	1	0	0
-statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5	5	0	0
-statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3	0	0	0
-statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1	0	0	0
-statements_digest	7c5b403e11cb8fa41954f8b81d47fb44	CREATE SCHEMA statements_digest_temp 	2	2	0	0
-statements_digest	d5c2a9eedc964698407667a633301e69	DROP SCHEMA statements_digest_temp 	2	0	0	0
-statements_digest	add5619cd2761d01c66b68b50a4c0476	SELECT ? FROM no_such_table 	1	0	0	1
-statements_digest	f59e7a7dbcdc342b7ea72ae24e5ef081	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2	0	0	1
-statements_digest	b42311b2b180ba680ebb286f671982f1	DROP TABLE dup_table 	1	0	0	0
-statements_digest	8af43d157243ebdc9dcb1a9502acdd24	INSERT INTO t11 VALUES (?) 	1	1	1	0
-statements_digest	cee5b131782212e0ba1cd76ba28485c4	SHOW WARNINGS 	1	0	0	0
-statements_digest	438623439c3a1702203d6190795127ad	PREPARE stmt FROM ? 	1	0	0	0
-statements_digest	e53b71815168ad954fd921a6ae1860c9	EXECUTE stmt 	2	0	0	0
-statements_digest	3bccf5096186ceaf50c11c3deb4e21cf	DEALLOCATE PREPARE stmt 	1	0	0	0
-statements_digest	e20f8d5cb15105439af39592b79c0edd	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1	0	0	0
-statements_digest	10298a45c9f7114e4985de53ca99bda7	CALL p1 ( ) 	2	0	0	0
-statements_digest	efc046c5d04acb8afa61326f759ad380	DROP PROCEDURE p1 	1	0	0	0
-statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1	0	0	0
-statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2	0	0	0
-statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1	0	0	0
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1	0	0	0
-statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2	2	0	0
-statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1	0	0	0
+statements_digest	?	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
+statements_digest	?	SELECT ? FROM t1 	1	0	0	0
+statements_digest	?	SELECT ? FROM `t1` 	1	0	0	0
+statements_digest	?	SELECT ?, ... FROM t1 	2	0	0	0
+statements_digest	?	SELECT ? FROM t2 	1	0	0	0
+statements_digest	?	SELECT ?, ... FROM t2 	2	0	0	0
+statements_digest	?	INSERT INTO t1 VALUES (?) 	1	1	0	0
+statements_digest	?	INSERT INTO t2 VALUES (?) 	1	1	0	0
+statements_digest	?	INSERT INTO t3 VALUES (...) 	4	4	0	0
+statements_digest	?	INSERT INTO t4 VALUES (...) 	1	1	0	0
+statements_digest	?	INSERT INTO t5 VALUES (...) 	1	1	0	0
+statements_digest	?	INSERT INTO t1 VALUES (?) /* , ... */ 	2	7	0	0
+statements_digest	?	INSERT INTO t3 VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	?	INSERT INTO t5 VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	?	INSERT INTO t1 VALUES ( NULL ) 	1	1	0	0
+statements_digest	?	INSERT INTO t6 VALUES (...) 	5	5	0	0
+statements_digest	?	SELECT ? + ? 	3	0	0	0
+statements_digest	?	SELECT ? 	1	0	0	0
+statements_digest	?	CREATE SCHEMA statements_digest_temp 	2	2	0	0
+statements_digest	?	DROP SCHEMA statements_digest_temp 	2	0	0	0
+statements_digest	?	SELECT ? FROM no_such_table 	1	0	0	1
+statements_digest	?	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2	0	0	1
+statements_digest	?	DROP TABLE dup_table 	1	0	0	0
+statements_digest	?	INSERT INTO t11 VALUES (?) 	1	1	1	0
+statements_digest	?	SHOW WARNINGS 	1	0	0	0
+statements_digest	?	PREPARE stmt FROM ? 	1	0	0	0
+statements_digest	?	EXECUTE stmt 	2	0	0	0
+statements_digest	?	DEALLOCATE PREPARE stmt 	1	0	0	0
+statements_digest	?	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1	0	0	0
+statements_digest	?	CALL p1 ( ) 	2	0	0	0
+statements_digest	?	DROP PROCEDURE p1 	1	0	0	0
+statements_digest	?	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1	0	0	0
+statements_digest	?	SELECT func (...) 	2	0	0	0
+statements_digest	?	DROP FUNCTION func 	1	0	0	0
+statements_digest	?	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1	0	0	0
+statements_digest	?	INSERT INTO t12 VALUES (?) 	2	2	0	0
+statements_digest	?	DROP TRIGGER trg 	1	0	0	0
 ####################################
 # CLEANUP
 ####################################
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/statement_digest_consumers.result'
--- Percona-Server/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2013-03-20 16:30:32 +0000
@@ -125,43 +125,43 @@
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-statements_digest	e4a84a547a18a89f4708509a720def58	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
-statements_digest	ab105aea9c15b3842ad161d18349f9c4	SELECT ? FROM t1 	1
-statements_digest	835083efbaa5d8c29d01d558abb8216b	SELECT ? FROM `t1` 	1
-statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2
-statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1
-statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1
-statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1
-statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4
-statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1
-statements_digest	b201a20a2a534d2789750270b7f90fab	INSERT INTO t5 VALUES (...) 	1
-statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2
-statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1
-statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1
-statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5
-statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3
-statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1
-statements_digest	7c5b403e11cb8fa41954f8b81d47fb44	CREATE SCHEMA statements_digest_temp 	2
-statements_digest	d5c2a9eedc964698407667a633301e69	DROP SCHEMA statements_digest_temp 	2
-statements_digest	add5619cd2761d01c66b68b50a4c0476	SELECT ? FROM no_such_table 	1
-statements_digest	f59e7a7dbcdc342b7ea72ae24e5ef081	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2
-statements_digest	b42311b2b180ba680ebb286f671982f1	DROP TABLE dup_table 	1
-statements_digest	8af43d157243ebdc9dcb1a9502acdd24	INSERT INTO t11 VALUES (?) 	1
-statements_digest	cee5b131782212e0ba1cd76ba28485c4	SHOW WARNINGS 	1
-statements_digest	438623439c3a1702203d6190795127ad	PREPARE stmt FROM ? 	1
-statements_digest	e53b71815168ad954fd921a6ae1860c9	EXECUTE stmt 	2
-statements_digest	3bccf5096186ceaf50c11c3deb4e21cf	DEALLOCATE PREPARE stmt 	1
-statements_digest	e20f8d5cb15105439af39592b79c0edd	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1
-statements_digest	10298a45c9f7114e4985de53ca99bda7	CALL p1 ( ) 	2
-statements_digest	efc046c5d04acb8afa61326f759ad380	DROP PROCEDURE p1 	1
-statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1
-statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2
-statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1
-statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2
-statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1
+statements_digest	?	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
+statements_digest	?	SELECT ? FROM t1 	1
+statements_digest	?	SELECT ? FROM `t1` 	1
+statements_digest	?	SELECT ?, ... FROM t1 	2
+statements_digest	?	SELECT ? FROM t2 	1
+statements_digest	?	SELECT ?, ... FROM t2 	2
+statements_digest	?	INSERT INTO t1 VALUES (?) 	1
+statements_digest	?	INSERT INTO t2 VALUES (?) 	1
+statements_digest	?	INSERT INTO t3 VALUES (...) 	4
+statements_digest	?	INSERT INTO t4 VALUES (...) 	1
+statements_digest	?	INSERT INTO t5 VALUES (...) 	1
+statements_digest	?	INSERT INTO t1 VALUES (?) /* , ... */ 	2
+statements_digest	?	INSERT INTO t3 VALUES (...) /* , ... */ 	1
+statements_digest	?	INSERT INTO t5 VALUES (...) /* , ... */ 	1
+statements_digest	?	INSERT INTO t1 VALUES ( NULL ) 	1
+statements_digest	?	INSERT INTO t6 VALUES (...) 	5
+statements_digest	?	SELECT ? + ? 	3
+statements_digest	?	SELECT ? 	1
+statements_digest	?	CREATE SCHEMA statements_digest_temp 	2
+statements_digest	?	DROP SCHEMA statements_digest_temp 	2
+statements_digest	?	SELECT ? FROM no_such_table 	1
+statements_digest	?	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2
+statements_digest	?	DROP TABLE dup_table 	1
+statements_digest	?	INSERT INTO t11 VALUES (?) 	1
+statements_digest	?	SHOW WARNINGS 	1
+statements_digest	?	PREPARE stmt FROM ? 	1
+statements_digest	?	EXECUTE stmt 	2
+statements_digest	?	DEALLOCATE PREPARE stmt 	1
+statements_digest	?	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1
+statements_digest	?	CALL p1 ( ) 	2
+statements_digest	?	DROP PROCEDURE p1 	1
+statements_digest	?	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1
+statements_digest	?	SELECT func (...) 	2
+statements_digest	?	DROP FUNCTION func 	1
+statements_digest	?	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1
+statements_digest	?	INSERT INTO t12 VALUES (?) 	2
+statements_digest	?	DROP TRIGGER trg 	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 digest	digest_text
 ####################################
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/r/statement_digest_long_query.result'
--- Percona-Server/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2013-03-20 16:30:32 +0000
@@ -8,5 +8,5 @@
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-performance_schema	e8d937c7ecf79e105de0f9e364fa5edb	TRUNCATE TABLE events_statements_summary_by_digest 	1
-performance_schema	5d9a2f95653d8ca9d9cea3eefff7e361	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
+performance_schema	?	TRUNCATE TABLE events_statements_summary_by_digest 	1
+performance_schema	?	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/digest_table_full.test'
--- Percona-Server/mysql-test/suite/perfschema/t/digest_table_full.test	2012-10-24 14:51:05 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/digest_table_full.test	2013-03-20 16:30:32 +0000
@@ -19,6 +19,7 @@
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
+--replace_column 2 ?
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
        SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/ortho_iter.test'
--- Percona-Server/mysql-test/suite/perfschema/t/ortho_iter.test	2011-10-19 21:49:22 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/ortho_iter.test	2013-03-20 16:30:32 +0000
@@ -120,10 +120,6 @@
 $
 delimiter ;$
 
-# Check the configuration is ok
-show variables like "performance_schema%";
-show status like "performance_schema%";
-
 call check_instrument("wait/synch/mutex/");
 call check_instrument("wait/synch/rwlock/");
 call check_instrument("wait/synch/cond/");
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/privilege_table_io-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/privilege_table_io-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/privilege_table_io-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/rpl_gtid_func.test'
--- Percona-Server/mysql-test/suite/perfschema/t/rpl_gtid_func.test	2012-11-12 10:41:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/rpl_gtid_func.test	2013-03-20 16:30:32 +0000
@@ -44,6 +44,7 @@
 select * from performance_schema.setup_objects
   order by object_type, object_schema, object_name;
 
+--replace_column 1 ?
 select digest, digest_text, count_star
   from performance_schema.events_statements_summary_by_digest
   where digest_text like "%in_%_digest%";
@@ -66,6 +67,7 @@
 select * from performance_schema.setup_objects
   order by object_type, object_schema, object_name;
 
+--replace_column 1 ?
 select digest, digest_text, count_star
   from performance_schema.events_statements_summary_by_digest
   where digest_text like "%in_%_digest%";
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_idle-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_idle-master.opt	2011-12-16 11:01:45 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_idle-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-performance-schema-instrument='idle=OFF'
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_stages-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_stages-master.opt	2011-12-16 11:01:45 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_stages-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-performance-schema-instrument='stage/%=OFF'
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_statements-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_statements-master.opt	2011-12-16 11:01:45 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_statements-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-performance-schema-instrument='statement/%=OFF'
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_waits-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_waits-master.opt	2011-12-16 11:01:45 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_disable_waits-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-performance-schema-instrument='wait/%=OFF'
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-enable-performance-schema
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb.test'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb.test	2011-10-19 21:49:22 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_innodb.test	2013-03-20 16:30:32 +0000
@@ -5,7 +5,3 @@
 --source include/have_innodb.inc
 
 --source ../include/start_server_common.inc
-
-# Expecting nothing lost with default parameters
-
-show status like "performance_schema%";
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_account-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_account-master.opt	2011-07-29 09:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_account-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_accounts_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_cond_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_cond_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_cond_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_digests-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_digests-master.opt	2012-04-11 11:54:50 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_digests-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-performance-schema-digests-size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_class-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_file_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_file_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_file_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_host-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_host-master.opt	2011-07-29 09:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_host-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_hosts_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_class-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_mutex_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_mutex_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_mutex_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_class-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_rwlock_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_rwlock_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_actors-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_actors-master.opt	2010-05-20 15:43:53 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_actors-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_setup_actors_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt	2010-09-24 18:21:22 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_setup_objects_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_class-master.opt	2011-02-27 02:07:57 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_socket_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_inst-master.opt	2011-02-27 02:07:57 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_socket_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_socket_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stage_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stage_class-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stage_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_stage_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_stages_history_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history_long-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history_long-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_stages_history_long-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_stages_history_long_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_statements_history_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history_long-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history_long-master.opt	2011-02-17 18:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_statements_history_long-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_statements_history_long_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_hdl-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_hdl-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_hdl-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_table_handles=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_table_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_class-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_class-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_class-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_thread_classes=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_inst-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_inst-master.opt	2011-02-09 15:22:04 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_thread_inst-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_thread_instances=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_user-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_user-master.opt	2011-07-29 09:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_user-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_users_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt	2011-07-29 09:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_waits_history_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt	2011-07-29 09:10:56 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt	2013-03-20 16:30:32 +0000
@@ -1,2 +1,3 @@
 --loose-enable-performance-schema
 --loose-performance_schema_events_waits_history_long_size=0
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_off-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_off-master.opt	2010-01-12 01:47:27 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_off-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-disable-performance-schema
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_on-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_on-master.opt	2010-01-12 01:47:27 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_on-master.opt	2013-03-20 16:30:32 +0000
@@ -1,1 +1,2 @@
 --loose-enable-performance-schema
+--loose-performance-schema-max-statement-classes=167
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/start_server_on.test'
--- Percona-Server/mysql-test/suite/perfschema/t/start_server_on.test	2011-10-19 21:49:22 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/start_server_on.test	2013-03-20 16:30:32 +0000
@@ -4,7 +4,3 @@
 --source include/have_perfschema.inc
 
 --source ../include/start_server_common.inc
-
-# Expecting nothing lost with default parameters
-
-show status like "performance_schema%";
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/statement_digest.test'
--- Percona-Server/mysql-test/suite/perfschema/t/statement_digest.test	2012-10-24 14:51:05 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/statement_digest.test	2013-03-20 16:30:32 +0000
@@ -16,6 +16,7 @@
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
+--replace_column 2 ?
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
        SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/statement_digest_consumers.test'
--- Percona-Server/mysql-test/suite/perfschema/t/statement_digest_consumers.test	2012-10-24 14:51:05 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/statement_digest_consumers.test	2013-03-20 16:30:32 +0000
@@ -28,7 +28,9 @@
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
+--replace_column 2, ?
 SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+--replace_column 1, ?
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 
 # Cleanup for Digest
 
=== modified file 'Percona-Server/mysql-test/suite/perfschema/t/statement_digest_long_query.test'
--- Percona-Server/mysql-test/suite/perfschema/t/statement_digest_long_query.test	2012-10-24 14:51:05 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/statement_digest_long_query.test	2013-03-20 16:30:32 +0000
@@ -20,4 +20,5 @@
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
+--replace_column 2 ?
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_off-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_off-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_off-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== added file 'Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t-master.opt'
--- Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t-master.opt	2013-03-20 16:30:32 +0000
@@ -0,0 +1,1 @@
+--loose-performance-schema-max-statement-classes=167
 
=== 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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +0000
@@ -881,6 +881,9 @@
    int (*fill_is_table)(handlerton *hton, THD *thd, TABLE_LIST *tables, 
                         class Item *cond, 
                         enum enum_schema_tables);
+   int (*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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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-20 16:30:32 +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 */
 };
 
 /********************************************************************//**
@@ -3547,6 +3560,7 @@
 	fsp_open_info	remote;
 	ulint		tablespaces_found = 0;
 	ulint		valid_tablespaces_found = 0;
+	ulint		space_arch_log_no;
 
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(!fix_dict || rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
@@ -3637,9 +3651,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 +3672,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 +3694,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 +3921,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-20 16:30:32 +0000
@@ -989,6 +989,32 @@
 					 name to lower case */
 
 /*************************************************************//**
+Removes old archived transaction log files.
+@return	non-zero if error */
+static int 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_SUCCESS;
+	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) {
+				err= purge_archived_logs(0, log_file_lsn);
+			}
+		}
+	}
+	return (err == DB_SUCCESS) ? 0 : 1;
+}
+
+/*************************************************************//**
 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-20 16:30:32 +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-20 16:30:32 +0000
@@ -70,6 +70,9 @@
 /** 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 15
+
 /*******************************************************************//**
 Calculates where in log files we find a specified lsn.
 @return	log file number */
@@ -340,6 +343,7 @@
 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 */
 #else /* !UNIV_HOTBACKUP */
 
=== 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-20 16:30:32 +0000
@@ -297,7 +297,7 @@
 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
 
=== 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-20 16:30:32 +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,17 @@
 void
 srv_export_innodb_status(void);
 /*==========================*/
+/*************************************************************//**
+Removes old archived transaction log files.
+Both parameters couldn't be provided at the same time */
+UNIV_INTERN
+ulint
+purge_archived_logs(
+	time_t before_date,		/*!< in: all files modified
+					before timestamp should be removed */
+	unsigned long long 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-20 16:30:32 +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-20 16:30:32 +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 */
 
@@ -2225,7 +2221,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 +2240,25 @@
 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);
+	ulint	dirnamelen;
+
+	dirnamelen = strlen(srv_arch_dir);
+
+	ut_a(buf_len > dirnamelen + 18 + IB_ARCHIVED_LOGS_PREFIX_LEN);
+
+	strcpy(buf, srv_arch_dir);
+
+	if (buf[dirnamelen-1] != SRV_PATH_SEPARATOR) {
+		buf[dirnamelen++] = SRV_PATH_SEPARATOR;
+	}
+
+	sprintf(buf + dirnamelen, IB_ARCHIVED_LOGS_PREFIX "%016lu", (ulong) file_no);
 }
 
 /******************************************************//**
@@ -2287,6 +2296,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 +2332,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 +2351,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 +2383,19 @@
 
 		if (next_offset % group->file_size == 0) {
 			open_mode = OS_FILE_CREATE;
+			if (n_files == 0) {
+				/* Adjust archived_file_no 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 +2432,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 +2470,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 +2489,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);
@@ -2822,18 +2843,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 +3098,6 @@
 /*=======================================*/
 {
 	lsn_t			lsn;
-	ulint			arch_log_no;
 	ulint			count = 0;
 	ulint			total_trx;
 	ulint			pending_io;
@@ -3304,15 +3314,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 +3373,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 +3596,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-20 16:30:32 +0000
@@ -3690,7 +3690,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 +3699,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,14 +3749,13 @@
 
 	/* 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 */
@@ -3828,7 +3828,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,7 +3863,7 @@
 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
@@ -3880,7 +3880,7 @@
 	ulint		group_id;
 	ulint		trunc_len;
 	ibool		ret;
-	ulint		err;
+	dberr_t		err;
 
 	ut_a(0);
 
 
=== 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-20 16:30:32 +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,132 @@
 	return(thread_active);
 }
 
+/*************************************************************//**
+Removes old archived transaction log files.
+Both parameters couldn't be provided at the same time */
+ulint
+purge_archived_logs(
+	time_t before_date,		/*!< in: all files modified
+					before timestamp should be removed */
+	unsigned long long 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 = strtoll(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. Aquire log_sys->mutex
+		to make sue 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 enforced by checking:
+		  1. fil_space_contains_node.
+		  2. group->archived_offset % group->file_size != 0, i.e. have
+		     archive in progress and we are going to delete it.
+		This aimed to cover 3 cases:
+		  a. Normal case when we have one archive in progress,
+		     both 1 and 2 are TRUE
+		  b. When we have more then 1 archiveds in fil_space,
+		     this can happen when flushed LSN range crosses file
+		     boundary
+		  c. Whan 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);
+			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 +2333,18 @@
 	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);
+		MONITOR_INC_TIME_IN_MICRO_SECS(MONITOR_SRV_CHECKPOINT_MICROSECOND,
+				       counter_time);
+	}
 }
 
 /*********************************************************************//**
 
=== 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-20 16:30:32 +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);
@@ -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
@@ -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;