diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-16 12:58:02 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-16 12:58:02 +0300 |
| commit | bf52501022730fa7426ae6cde587d13da1744dbf (patch) | |
| tree | 1c8fa4a03165c941b25e7eda32a78a3076d08052 | |
| parent | 0ab6e69372bdf866f55089d6a8344d0b2322a9e1 (diff) | |
| parent | 1990710a970b4aa5bc8e43f63a50f18d3d05d0a4 (diff) | |
| download | mariadb-git-bf52501022730fa7426ae6cde587d13da1744dbf.tar.gz | |
merged changelog
| -rw-r--r-- | Docs/manual.texi | 8 | ||||
| -rw-r--r-- | include/global.h | 10 | ||||
| -rw-r--r-- | mysys/my_port.c | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index b49f08c889c..f312e35e135 100644 --- a/Docs/manual.texi +++ b/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 diff --git a/include/global.h b/include/global.h index a6cc561fb0a..8067fe5f38b 100644 --- a/include/global.h +++ b/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 diff --git a/mysys/my_port.c b/mysys/my_port.c index a9778875850..bf5dbcbace1 100644 --- a/mysys/my_port.c +++ b/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; } |