diff options
| author | unknown <kaa@polly.(none)> | 2007-10-02 11:32:33 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-02 11:32:33 +0400 |
| commit | 73cb92767d4e4b4e16c56dfe3d82304472274933 (patch) | |
| tree | 214763ff02015cbe872f8e196b15703bece7bd9b /include | |
| parent | e25e0979b47cdf9178025e54e2fa0ab9a8207f65 (diff) | |
| parent | 05055a45b39067e69a6e560765ee8b7f4be22694 (diff) | |
| download | mariadb-git-73cb92767d4e4b4e16c56dfe3d82304472274933.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
sql/mysqld.cc:
Auto merged
include/keycache.h:
Manual merge.
include/my_global.h:
Manual merge.
include/my_sys.h:
Manual merge.
mysys/mf_keycache.c:
Manual merge.
mysys/my_largepage.c:
Manual merge.
mysys/my_malloc.c:
Manual merge.
mysys/safemalloc.c:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index b9452adebbb..9b5e4c164da 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -860,9 +860,6 @@ typedef SOCKET_SIZE_TYPE size_socket; #define DBL_MAX 1.79769313486231470e+308 #define FLT_MAX ((float)3.40282346638528860e+38) #endif -#ifndef SSIZE_MAX -#define SSIZE_MAX ((~((size_t) 0)) / 2) -#endif #ifndef SIZE_T_MAX #define SIZE_T_MAX ~((size_t) 0) #endif |