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

1 files changed, 1 insertions, 1 deletions

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);