Automatic merge

storage/maria/ma_checkpoint.c

@@ -603,24 +603,25 @@ pthread_handler_t ma_checkpoint_background(void *arg)
           want to checkpoint every minute, hence the positive
           maria_checkpoint_min_activity.
         */
-        if (horizon != log_horizon_at_last_checkpoint &&
-            (ulonglong) (horizon - log_horizon_at_last_checkpoint) <=
+        if ((ulonglong) (horizon - log_horizon_at_last_checkpoint) <=
             maria_checkpoint_min_log_activity &&
             ((ulonglong) (maria_pagecache->global_cache_write -
                           pagecache_flushes_at_last_checkpoint) *
              maria_pagecache->block_size) <=
             maria_checkpoint_min_cache_activity)
         {
-          /* don't take checkpoint, so don't know what to flush */
-          pages_to_flush_before_next_checkpoint= 0;
+          /*
+            Not enough has happend since last checkpoint.
+            Sleep for a while and try again later
+          */
           sleep_time= interval;
           break;
         }
         sleep_time= 1;
         ma_checkpoint_execute(CHECKPOINT_MEDIUM, TRUE);
         /*
-          Snapshot this kind of "state" of the engine. Note that the value below
-          is possibly greater than last_checkpoint_lsn.
+          Snapshot this kind of "state" of the engine. Note that the value
+          below is possibly greater than last_checkpoint_lsn.
         */
         log_horizon_at_last_checkpoint= translog_get_horizon();
         pagecache_flushes_at_last_checkpoint=