merged changelog

Docs/manual.texi

@@ -46927,18 +46927,16 @@ not yet 100% confident in this code.
 
 @node News-3.23.53, News-3.23.52, News-3.23.x, News-3.23.x
 @appendixsubsec Changes in release 3.23.53
-
 @itemize @bullet
 @item
-Add multithreaded stress tests for InnoDB
+Fixed problem with @code{UNSIGNED BIGINT} on AIX (again).
+@item
+Multithreaded stress tests for InnoDB.
 @end itemize
 
 @appendixsubsec Changes in release 3.23.52
-
 @itemize @bullet
 @item
-Fixed problem with @code{UNSIGNED BIGINT} on AIX.
-@item
 Fixed security bug when having an empty databasename in the @code{user.db}
 table.
 @item

include/global.h

@@ -104,9 +104,15 @@
 #define _H_STRINGS
 #define _SYS_STREAM_H
 #define _AIX32_CURSES
-#define longlong2double(A) my_longlong2double(A)
-double my_longlong2double(unsigned long long A);
+#define ulonglong2double(A) my_ulonglong2double(A)
+#ifdef	__cplusplus
+extern "C" {
 #endif
+double my_ulonglong2double(unsigned long long A);
+#ifdef	__cplusplus
+}
+#endif
+#endif /* _AIX */
 
 #ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */
 #undef HAVE_SNPRINTF

mysys/my_port.c

@@ -33,7 +33,7 @@
 
 
 
-double my_longlong2double(unsigned long long nr)
+double my_ulonglong2double(unsigned long long nr)
 {
   return (double) nr;
 }