mysql-5.5.22 merge

mysql-test/suite/innodb/t/group_commit_crash.test:
  remove autoincrement to avoid rbr being used for insert ... select
mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test:
  remove autoincrement to avoid rbr being used for insert ... select
mysys/my_addr_resolve.c:
  a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack
mysys/stacktrace.c:
  my_vsnprintf() is ok here, in 5.5

5 files changed, 5 insertions, 6 deletions

diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index 65defb5d33b..4183b1fcd99 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000, 2003-2007 MySQL AB, 2009, 2010 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2012, 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/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c
index e74845c2808..e5a3a5fe13b 100644
--- a/mysys/my_addr_resolve.c
+++ b/mysys/my_addr_resolve.c
@@ -134,10 +134,10 @@ err:
 #include <ctype.h>
 static int in[2], out[2];
 static int initialized= 0;
+static char output[1024];
 int my_addr_resolve(void *ptr, my_addr_loc *loc)
 {
   char input[32], *s;
-  char output[1024];
   size_t len;
 
   len= my_snprintf(input, sizeof(input), "%p\n", ptr);
diff --git a/mysys/my_init.c b/mysys/my_init.c
index cdd07ec6a8b..c16602318ca 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates
    Copyright (c) 2009, 2011, Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c
index 67b9e7d961f..b0e910f7ba0 100644
--- a/mysys/my_symlink.c
+++ b/mysys/my_symlink.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2010, Oracle and/or its affiliates
+   Copyright (c) 2001, 2011, 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/mysys/stacktrace.c b/mysys/stacktrace.c
index 6cede382b4b..846a90cc127 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -755,7 +755,7 @@ size_t my_safe_printf_stderr(const char* fmt, ...)
   size_t result;
   va_list args;
   va_start(args,fmt);
-  result= vsnprintf(to, sizeof(to), fmt, args);
+  result= my_vsnprintf(to, sizeof(to), fmt, args);
   va_end(args);
   my_write_stderr(to, result);
   return result;