1 files changed, 11 insertions, 15 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index 1e9120e655f..86543ca60fb 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
@@ -19,8 +19,8 @@
 #include <tap.h>
 #include "../trnman.h"
 
-extern my_bool maria_log_remove();
-extern void translog_example_table_init();
+extern my_bool maria_log_remove(const char *testdir);
+extern char *create_tmpdir(const char *progname);
 
 #ifndef DBUG_OFF
 static const char *default_dbug_option;
@@ -268,17 +268,18 @@ int main(int argc __attribute__((unused)),
   pthread_attr_t thr_attr;
   int *param, error;
   int rc;
-
-  /* Disabled until Sanja tests */
-  plan(1);
-  ok(1, "disabled");
-  exit(0);
+  MY_INIT(argv[0]);
 
   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 *)".";
+  maria_data_root= create_tmpdir(argv[0]);
+  if (maria_log_remove(0))
+    exit(1);
+
   long_buffer= malloc(LONG_BUFFER_SIZE + 7 * 2 + 2);
   if (long_buffer == 0)
   {
@@ -288,11 +289,6 @@ int main(int argc __attribute__((unused)),
   for (i= 0; i < (LONG_BUFFER_SIZE + 7 * 2 + 2); i++)
     long_buffer[i]= (i & 0xFF);
 
-  MY_INIT(argv[0]);
-  if (maria_log_remove())
-    exit(1);
-
-
 #ifndef DBUG_OFF
 #if defined(__WIN__)
   default_dbug_option= "d:t:i:O,\\ma_test_loghandler.trace";
@@ -350,7 +346,7 @@ int main(int argc __attribute__((unused)),
     fprintf(stderr, "Got error: init_pagecache() (errno: %d)\n", errno);
     exit(1);
   }
-  if (translog_init_with_table(".", LOG_FILE_SIZE, 50112, 0, &pagecache,
+  if (translog_init_with_table(maria_data_root, LOG_FILE_SIZE, 50112, 0, &pagecache,
                                LOG_FLAGS, 0, &translog_example_table_init,
                                0))
   {
@@ -549,7 +545,7 @@ err:
   translog_destroy();
   end_pagecache(&pagecache, 1);
   ma_control_file_end();
-  if (maria_log_remove())
+  if (maria_log_remove(maria_data_root))
     exit(1);
 
   return(exit_status());