diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
| commit | 0e3a80e0a851822112226e5e792320389aa0f2ae (patch) | |
| tree | ff7694d43f6a555d626904a5e76d66755c22f43d /include/my_global.h | |
| parent | cc85fe239dd14088b2f326f263765612b03e8f61 (diff) | |
| parent | 53da51de9d8fc607063e131cc32361f39d95ac2d (diff) | |
| download | mariadb-git-0e3a80e0a851822112226e5e792320389aa0f2ae.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- storage/myisam/mi_packrec.c
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 81ad947c6b6..255958e08b0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -901,7 +901,7 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FLT_MAX ((float)3.40282346638528860e+38) #endif #ifndef SIZE_T_MAX -#define SIZE_T_MAX ~((size_t) 0) +#define SIZE_T_MAX (~((size_t) 0)) #endif #ifndef isfinite |