From 6120fbace42f07a497e61035c6700bbba460d840 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Dec 2010 18:31:11 +0200 Subject: [PATCH] Aria unit tests fixed to have correct pagecache shutdown. The Aria multithread test unlocked. storage/maria/unittest/ma_pagecache_consist.c: Fixed pagecache shutdown. storage/maria/unittest/ma_pagecache_rwconsist.c: Fixed pagecache shutdown. storage/maria/unittest/ma_test_loghandler_multithread-t.c: The Aria multithread test unlocked. storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Fixed pagecache shutdown. --- storage/maria/unittest/ma_pagecache_consist.c | 1 + storage/maria/unittest/ma_pagecache_rwconsist.c | 1 + storage/maria/unittest/ma_test_loghandler_multithread-t.c | 5 ----- storage/maria/unittest/ma_test_loghandler_pagecache-t.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/storage/maria/unittest/ma_pagecache_consist.c b/storage/maria/unittest/ma_pagecache_consist.c index 7dbdba433c6..0a9e5737c7e 100644 --- a/storage/maria/unittest/ma_pagecache_consist.c +++ b/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")); diff --git a/storage/maria/unittest/ma_pagecache_rwconsist.c b/storage/maria/unittest/ma_pagecache_rwconsist.c index a1a22b5e18d..ff386c48414 100644 --- a/storage/maria/unittest/ma_pagecache_rwconsist.c +++ b/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")); diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c index 354f5d12e08..dbf47ad2ee1 100644 --- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c +++ b/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 ); diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c index bfbba5407c1..a32cf32c787 100644 --- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c +++ b/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)