diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-06-21 13:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-06-21 13:24:56 +0300 |
| commit | 86686a3b6689749053b0fcd4edbc5b38d0f25c6e (patch) | |
| tree | a7e54c40d26f9f82d53fd153e46e11b2f1534bdd /include | |
| parent | 8103b543e70ffee8423587ac8d75be403ed05605 (diff) | |
| parent | a0e5d9daff530123f0d7b0e36d13cde897fb5c28 (diff) | |
| download | mariadb-git-86686a3b6689749053b0fcd4edbc5b38d0f25c6e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 9f7ec220f2c..e009447c192 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -256,6 +256,6 @@ typedef struct } LEX_STRING; #define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1)) -#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1)) +#define C_STRING_WITH_LEN(X) ((char *) (X)), ((uint) (sizeof(X) - 1)) #endif diff --git a/include/my_global.h b/include/my_global.h index f3f3825957f..21b2251af1d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -797,6 +797,9 @@ 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 #if !defined(HAVE_ISINF) && !defined(isinf) #define isinf(X) 0 |