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