summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-08 12:37:38 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-08 12:37:38 +0300
commit28f708e1e3e87d135d23656804d96638439683fd (patch)
tree51f403475753659cbaea86ef859beae0f84f876a /storage
parent4249382a650adb1cf56f40ebeb314ec6d27231db (diff)
parent6b8788e425f649bcdb0f882c81b081795005fbe7 (diff)
downloadmariadb-git-28f708e1e3e87d135d23656804d96638439683fd.tar.gz
Automatic merge with 5.1
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/unittest/ma_test_loghandler-t.c2
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multigroup-t.c2
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multithread-t.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler-t.c b/storage/maria/unittest/ma_test_loghandler-t.c
index ffac9b04839..53459a5239d 100644
--- a/storage/maria/unittest/ma_test_loghandler-t.c
+++ b/storage/maria/unittest/ma_test_loghandler-t.c
@@ -173,6 +173,8 @@ int main(int argc __attribute__((unused)), char *argv[])
maria_data_root= (char *)".";
if (maria_log_remove())
exit(1);
+ /* We don't need to do physical syncs in this test */
+ my_disable_sync= 1;
for (i= 0; i < (LONG_BUFFER_SIZE + LSN_STORE_SIZE * 2 + 2); i+= 2)
{
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 7ba7ce3176d..aab94ff10c7 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -247,6 +247,8 @@ int main(int argc __attribute__((unused)), char *argv[])
load_defaults("my", load_default_groups, &argc, &argv);
default_argv= argv;
get_options(&argc, &argv);
+ /* We don't need to do physical syncs in this test */
+ my_disable_sync= 1;
if (maria_log_remove())
exit(1);
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index dbf47ad2ee1..e46fe047a97 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
@@ -271,6 +271,8 @@ int main(int argc __attribute__((unused)),
plan(WRITERS + FLUSHERS +
ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS );
+ /* We don't need to do physical syncs in this test */
+ my_disable_sync= 1;
bzero(&pagecache, sizeof(pagecache));
maria_data_root= (char *)".";