diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 14 | ||||
| -rw-r--r-- | include/hash.h | 2 | ||||
| -rw-r--r-- | include/m_ctype.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 6 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | include/thr_lock.h | 2 |
6 files changed, 24 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index aab401346da..fd50c705b7d 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -260,6 +260,15 @@ inline double ulonglong2double(ulonglong value) #define my_off_t2double(A) ulonglong2double(A) #endif /* _WIN64 */ +inline ulonglong double2ulonglong(double d) +{ + double t= d - (double) 0x8000000000000000ULL; + + if (t >= 0) + return ((ulonglong) t) + 0x8000000000000000ULL; + return (ulonglong) d; +} + #if SIZEOF_OFF_T > 4 #define lseek(A,B,C) _lseeki64((A),(longlong) (B),(C)) #define tell(A) _telli64(A) @@ -381,6 +390,9 @@ inline double ulonglong2double(ulonglong value) #define HAVE_OPENSSL 1 #define HAVE_YASSL 1 +#define COMMUNITY_SERVER 1 +#define ENABLED_PROFILING 1 + /* Define charsets you want */ /* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_ascii */ diff --git a/include/hash.h b/include/hash.h index 1942e9974be..f649b39a3cb 100644 --- a/include/hash.h +++ b/include/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/m_ctype.h b/include/m_ctype.h index b85894e94f5..04cf921dfee 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -472,6 +472,7 @@ my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, size_t len); uint my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong len); my_bool my_charset_is_ascii_based(CHARSET_INFO *cs); my_bool my_charset_is_8bit_pure_ascii(CHARSET_INFO *cs); +uint my_charset_repertoire(CHARSET_INFO *cs); #define _MY_U 01 /* Upper case */ diff --git a/include/my_global.h b/include/my_global.h index 6712198e2f0..554b26a1602 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -798,6 +798,9 @@ typedef SOCKET_SIZE_TYPE size_socket; #define ulonglong2double(A) ((double) (ulonglong) (A)) #define my_off_t2double(A) ((double) (my_off_t) (A)) #endif +#ifndef double2ulonglong +#define double2ulonglong(A) ((ulonglong) (double) (A)) +#endif #endif #ifndef offsetof @@ -1138,6 +1141,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #define dbug_volatile #endif +/* Some helper macros */ +#define YESNO(X) ((X) ? "yes" : "no") + /* Defines for time function */ #define SCALE_SEC 100 #define SCALE_USEC 10000 diff --git a/include/my_pthread.h b/include/my_pthread.h index 538457a523a..c479e6f72c6 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -679,6 +679,8 @@ extern const char *my_thread_name(void); extern my_thread_id my_thread_dbug_id(void); extern int pthread_no_free(void *); extern int pthread_dummy(int); +extern void my_mutex_init(); +extern void my_mutex_end(); /* All thread specific variables are in the following struct */ diff --git a/include/thr_lock.h b/include/thr_lock.h index cf27527cad4..261f596f911 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |