Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often we should do a checkpoint.

Added more error printing to log if log_warnings > 2
Give an error if checkpoint record is not correct,

mysql-test/suite/maria/r/compat_aliases.result:
  Added ARIA_CHECKPOINT_LOG_ACTIVITY
mysql-test/suite/maria/r/maria3.result:
  Added ARIA_CHECKPOINT_LOG_ACTIVITY
storage/maria/ha_maria.cc:
  Added ARIA_CHECKPOINT_LOG_ACTIVITY
  Added more error printing to log if log_warnings > 2
  Added db and table name to error message when printing to log
storage/maria/ma_check.c:
  Fixed bug where we didn't reset some variables between repair() calls
storage/maria/ma_checkpoint.c:
  Made maria_checkpoint_min_activity global.
  Don't do checkpoint if no data logged.
  Changed test for if we should do checkpoint to test separately for if log has grown or if we have had a lot of of cache writes.
storage/maria/ma_recovery.c:
  Give an error if checkpoint record is not correct
storage/maria/trnman.c:
  Don't print not needed long_transaction_id entries for checkpoints.

1 files changed, 5 insertions, 0 deletions

diff --git a/storage/maria/compat_aliases.cc b/storage/maria/compat_aliases.cc
index 2d3c67d69a7..ce8838b2da2 100644
--- a/storage/maria/compat_aliases.cc
+++ b/storage/maria/compat_aliases.cc
@@ -203,11 +203,16 @@ static struct st_mysql_sys_var* system_variables_aliases[]= {
       THDVAR(0, name) == MYSQL_SYSVAR_NAME(name).def_val)                 \
     THDVAR(0, name)= name ## _alias;
 
+/* Note:
+   The following list must be identical to the list for system_variables[] in ha_maria.cc
+*/
+
 void copy_variable_aliases()
 {
   int i= 0;
   COPY_SYSVAR(block_size);
   COPY_SYSVAR(checkpoint_interval);
+  i++;                                          // Skip checkpoint_min_log_activity
   COPY_SYSVAR(force_start_after_recovery_failures);
   COPY_SYSVAR(group_commit);
   COPY_SYSVAR(group_commit_interval);