diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-21 21:58:12 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-21 21:58:12 +0300 |
| commit | 0ce9d6af4fffbadeb1824a4868889eba0ac58daa (patch) | |
| tree | 5f5a744b449128b32f8a09bf6a567d24f7412b46 /include | |
| parent | 9d97b5ff8ce69b1c9ec10d822c094b1e11351dd8 (diff) | |
| parent | 87a9e90fd0042ee06bea16e46cc7353043936b99 (diff) | |
| download | mariadb-git-0ce9d6af4fffbadeb1824a4868889eba0ac58daa.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index f91b45ee469..cd04ab971db 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -224,6 +224,7 @@ enum ha_base_keytype { /* Errorcodes given by functions */ +/* opt_sum_query() assumes these codes are > 1 */ #define HA_ERR_KEY_NOT_FOUND 120 /* Didn't find key on read or update */ #define HA_ERR_FOUND_DUPP_KEY 121 /* Dupplicate key on write */ #define HA_ERR_RECORD_CHANGED 123 /* Uppdate with is recoverable */ diff --git a/include/my_global.h b/include/my_global.h index 98034fc1cff..15495c60dd7 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -290,9 +290,7 @@ C_MODE_END /* This has to be after include limits.h */ #define HAVE_ERRNO_AS_DEFINE #define HAVE_FCNTL_LOCK -#undef HAVE_SYS_UN_H #undef HAVE_FINITE -#undef HAVE_RINT #undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ #undef LONGLONG_MAX /* standard system library 'limits.h' */ #endif @@ -361,7 +359,7 @@ typedef unsigned short ushort; #define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1)) #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0]))) #ifndef HAVE_RINT -#define rint(A) floor((A)+0.5) +#define rint(A) floor((A)+(((A) < 0)? -0.5 : 0.5)) #endif /* Define some general constants */ diff --git a/include/my_sys.h b/include/my_sys.h index c67a150f24f..603b3bad6bd 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -749,6 +749,7 @@ extern my_bool my_uncompress(byte *, ulong *, ulong *); extern byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen); extern ulong checksum(const byte *mem, uint count); extern uint my_bit_log2(ulong value); +uint my_count_bits(ulonglong v); extern void my_sleep(ulong m_seconds); #ifdef __WIN__ |