Merge branch '10.6' into bb-10.6-release

MariaDB · Nov 7, 2022 · c4ce012 · c4ce012
2 parents d157b25 + 118d39d
commit c4ce012
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=11
+MYSQL_VERSION_PATCH=12
 SERVER_MATURITY=stable
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c
@@ -319,12 +319,20 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
     /* Save result for future comparisons. */
     strnmov(addr2line_binary, info.dli_fname, sizeof(addr2line_binary));
 
+#ifdef _AIX
+    /*
+      info.dli_fbase is a char on AIX and casting it doesn't fool gcc.
+      leave backtracing broken on AIX until a real solution can be found.
+    */
+    addr_offset= NULL;
+#else
     /*
       Check if we should use info.dli_fbase as an offset or not
       for the base program. This is depending on if the compilation is
       done with PIE or not.
     */
-    addr_offset= (void*) info.dli_fbase;
+    addr_offset= info.dli_fbase;
+#endif
 #ifndef __PIE__
     if (strcmp(info.dli_fname, my_progname) == 0 &&
         addr_resolve((void*) my_addr_resolve, loc) == 0 &&