summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-13 13:29:44 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-13 13:29:44 +0100
commit262a2ab59d5bf3974efc3758555919576b9bb2bf (patch)
treedd6140282d19660216ed2ef3f38e3bcd615166ef /storage/maria
parentd32b537edf30a845f74327523844dd6fe551ac8e (diff)
downloadmariadb-git-262a2ab59d5bf3974efc3758555919576b9bb2bf.tar.gz
monty's cleanup of my_thr_init.c
and collateral changes
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multithread-t.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index 83cfdd196f9..5933059263a 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
@@ -336,8 +336,6 @@ int main(int argc __attribute__((unused)),
thr_setconcurrency(2);
#endif
- my_thread_global_init();
-
if (ma_control_file_open(TRUE, TRUE))
{
fprintf(stderr, "Can't init control file (%d)\n", errno);
@@ -551,6 +549,7 @@ err:
if (maria_log_remove(maria_data_root))
exit(1);
+ my_end(0);
return(exit_status());
}