Automatic merge with 5.1-release

storage/maria/ma_pagecache.c

@@ -1046,7 +1046,6 @@ static inline void dec_counter_for_resize_op(PAGECACHE *pagecache)
                         ("thread %ld", last_thread->next->id));
     pagecache_pthread_cond_signal(&last_thread->next->suspend);
   }
-  DBUG_ASSERT((longlong) pagecache->cnt_for_resize_op >= 0);
 #else
   pagecache->cnt_for_resize_op--;
 #endif

storage/maria/unittest/ma_pagecache_consist.c

@@ -476,6 +476,7 @@ int main(int argc __attribute__((unused)),
   pthread_mutex_unlock(&LOCK_thread_count);
   DBUG_PRINT("info", ("thread ended"));
 
+  flush_pagecache_blocks(&pagecache, &file1, FLUSH_IGNORE_CHANGED);
   end_pagecache(&pagecache, 1);
   DBUG_PRINT("info", ("Page cache ended"));
 

storage/maria/unittest/ma_pagecache_rwconsist.c

@@ -341,6 +341,7 @@ int main(int argc __attribute__((unused)),
   pthread_mutex_unlock(&LOCK_thread_count);
   DBUG_PRINT("info", ("thread ended"));
 
+  flush_pagecache_blocks(&pagecache, &file1, FLUSH_IGNORE_CHANGED);
   end_pagecache(&pagecache, 1);
   DBUG_PRINT("info", ("Page cache ended"));
 

storage/maria/unittest/ma_test_loghandler_multithread-t.c

@@ -269,11 +269,6 @@ int main(int argc __attribute__((unused)),
   int *param, error;
   int rc;
 
-  /* Disabled until Sanja tests */
-  plan(1);
-  ok(1, "disabled");
-  exit(0);
-
   plan(WRITERS + FLUSHERS +
        ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS );
 

storage/maria/unittest/ma_test_loghandler_pagecache-t.c

@@ -168,7 +168,7 @@ int main(int argc __attribute__((unused)), char *argv[])
                     PAGECACHE_PIN_LEFT_UNPINNED,
                     PAGECACHE_WRITE_DELAY,
                     0, LSN_IMPOSSIBLE);
-    flush_pagecache_blocks(&pagecache, &file1, FLUSH_FORCE_WRITE);
+    flush_pagecache_blocks(&pagecache, &file1, FLUSH_RELEASE);
   }
   my_close(file1.file, MYF(MY_WME));
   if ((file1.file= my_open(first_translog_file, O_RDONLY, MYF(MY_WME))) < 0)