Merge 5.5 -> 5.5-mwl248.

3 files changed, 4 insertions, 3 deletions

diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index 062a0963e76..bcfb9835c10 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2006, 2011, Oracle and/or its affiliates
+/*
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c
index ae9bb6903f5..35e782eb360 100644
--- a/unittest/mysys/my_atomic-t.c
+++ b/unittest/mysys/my_atomic-t.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/unittest/mysys/thr_template.c b/unittest/mysys/thr_template.c
index 5bb9809b1e1..7304eb50955 100644
--- a/unittest/mysys/thr_template.c
+++ b/unittest/mysys/thr_template.c
@@ -54,7 +54,7 @@ void test_concurrently(const char *test, pthread_handler handler, int n, int m)
 
 int main(int argc __attribute__((unused)), char **argv)
 {
-  MY_INIT("thd_template");
+  MY_INIT(argv[0]);
 
   if (argv[1] && *argv[1])
     DBUG_SET_INITIAL(argv[1]);