keycache.h   keycache.h 
skipping to change at line 20 skipping to change at line 20
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* Key cache variable structures */ /* Key cache variable structures */
#ifndef _keycache_h #ifndef _keycache_h
#define _keycache_h #define _keycache_h
#include "my_sys.h" /* flush_type */
C_MODE_START C_MODE_START
/* declare structures that is used by st_key_cache */ /* declare structures that is used by st_key_cache */
struct st_block_link; struct st_block_link;
typedef struct st_block_link BLOCK_LINK; typedef struct st_block_link BLOCK_LINK;
struct st_keycache_page; struct st_keycache_page;
typedef struct st_keycache_page KEYCACHE_PAGE; typedef struct st_keycache_page KEYCACHE_PAGE;
struct st_hash_link; struct st_hash_link;
typedef struct st_hash_link HASH_LINK; typedef struct st_hash_link HASH_LINK;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 m_ctype.h   m_ctype.h 
skipping to change at line 18 skipping to change at line 18
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* /*
A better inplementation of the UNIX ctype(3) library. A better inplementation of the UNIX ctype(3) library.
Notes: my_global.h should be included before ctype.h
*/ */
#ifndef _m_ctype_h #ifndef _m_ctype_h
#define _m_ctype_h #define _m_ctype_h
#include <my_attribute.h> #include <my_attribute.h>
#include "my_global.h" /* uint16, uchar */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define MY_CS_NAME_SIZE 32 #define MY_CS_NAME_SIZE 32
#define MY_CS_CTYPE_TABLE_SIZE 257 #define MY_CS_CTYPE_TABLE_SIZE 257
#define MY_CS_TO_LOWER_TABLE_SIZE 256 #define MY_CS_TO_LOWER_TABLE_SIZE 256
#define MY_CS_TO_UPPER_TABLE_SIZE 256 #define MY_CS_TO_UPPER_TABLE_SIZE 256
#define MY_CS_SORT_ORDER_TABLE_SIZE 256 #define MY_CS_SORT_ORDER_TABLE_SIZE 256
skipping to change at line 262 skipping to change at line 262
const char *str, size_t length, const char *str, size_t length,
int unsigned_fl, int unsigned_fl,
char **endptr, int *error); char **endptr, int *error);
size_t (*scan)(struct charset_info_st *, const char *b, const char *e, size_t (*scan)(struct charset_info_st *, const char *b, const char *e,
int sq); int sq);
} MY_CHARSET_HANDLER; } MY_CHARSET_HANDLER;
extern MY_CHARSET_HANDLER my_charset_8bit_handler; extern MY_CHARSET_HANDLER my_charset_8bit_handler;
extern MY_CHARSET_HANDLER my_charset_ucs2_handler; extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
/*
We define this CHARSET_INFO_DEFINED here to prevent a repeat of the
typedef in hash.c, which will cause a compiler error.
*/
#define CHARSET_INFO_DEFINED
/* See strings/CHARSET_INFO.txt about information on this structure */ /* See strings/CHARSET_INFO.txt about information on this structure */
typedef struct charset_info_st typedef struct charset_info_st
{ {
uint number; uint number;
uint primary_number; uint primary_number;
uint binary_number; uint binary_number;
uint state; uint state;
const char *csname; const char *csname;
const char *name; const char *name;
const char *comment; const char *comment;
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added


 m_string.h   m_string.h 
skipping to change at line 23 skipping to change at line 23
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* There may be prolems include all of theese. Try to test in /* There may be prolems include all of theese. Try to test in
configure with ones are needed? */ configure with ones are needed? */
/* This is needed for the definitions of strchr... on solaris */ /* This is needed for the definitions of strchr... on solaris */
#ifndef _m_string_h #ifndef _m_string_h
#define _m_string_h #define _m_string_h
#include "my_global.h" /* HAVE_* */
#ifndef __USE_GNU #ifndef __USE_GNU
#define __USE_GNU /* We want to use stpcpy */ #define __USE_GNU /* We want to use stpcpy */
#endif #endif
#if defined(HAVE_STRINGS_H) #if defined(HAVE_STRINGS_H)
#include <strings.h> #include <strings.h>
#endif #endif
#if defined(HAVE_STRING_H) #if defined(HAVE_STRING_H)
#include <string.h> #include <string.h>
#endif #endif
skipping to change at line 127 skipping to change at line 130
extern void bzero(uchar * dst,size_t len); extern void bzero(uchar * dst,size_t len);
#endif #endif
#if !defined(bcmp) && !defined(HAVE_BCMP) #if !defined(bcmp) && !defined(HAVE_BCMP)
extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len); extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len);
#endif #endif
#ifdef HAVE_purify #ifdef HAVE_purify
extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len); extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
#undef bcmp #undef bcmp
#define bcmp(A,B,C) my_bcmp((A),(B),(C)) #define bcmp(A,B,C) my_bcmp((A),(B),(C))
#define bzero_if_purify(A,B) bzero(A,B)
#else
#define bzero_if_purify(A,B)
#endif /* HAVE_purify */ #endif /* HAVE_purify */
#ifndef bmove512 #ifndef bmove512
extern void bmove512(uchar *dst,const uchar *src,size_t len); extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif #endif
#if !defined(HAVE_BMOVE) && !defined(bmove) #if !defined(HAVE_BMOVE) && !defined(bmove)
extern void bmove(uuchar *dst, const uchar *src,size_t len); extern void bmove(uuchar *dst, const uchar *src,size_t len);
#endif #endif
skipping to change at line 269 skipping to change at line 269
extern char *ll2str(longlong val,char *dst,int radix, int upcase); extern char *ll2str(longlong val,char *dst,int radix, int upcase);
extern char *longlong10_to_str(longlong val,char *dst,int radix); extern char *longlong10_to_str(longlong val,char *dst,int radix);
#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO)) #if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
extern longlong strtoll(const char *str, char **ptr, int base); extern longlong strtoll(const char *str, char **ptr, int base);
extern ulonglong strtoull(const char *str, char **ptr, int base); extern ulonglong strtoull(const char *str, char **ptr, int base);
#endif #endif
#endif #endif
#endif #endif
#define longlong2str(A,B,C) ll2str((A),(B),(C),1) #define longlong2str(A,B,C) ll2str((A),(B),(C),1)
/* my_vsnprintf.c */
extern size_t my_vsnprintf(char *str, size_t n,
const char *format, va_list ap);
extern size_t my_snprintf(char *to, size_t n, const char *fmt, ...)
ATTRIBUTE_FORMAT(printf, 3, 4);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
/* /*
LEX_STRING -- a pair of a C-string and its length. LEX_STRING -- a pair of a C-string and its length.
(it's part of the plugin API as a MYSQL_LEX_STRING) (it's part of the plugin API as a MYSQL_LEX_STRING)
*/ */
#include <mysql/plugin.h> #include <mysql/plugin.h>
skipping to change at line 368 skipping to change at line 361
if (end[-1] == 0x20 && start_words < end_words) if (end[-1] == 0x20 && start_words < end_words)
while (end > start_words && ((unsigned *)end)[-1] == SPACE_INT) while (end > start_words && ((unsigned *)end)[-1] == SPACE_INT)
end -= SIZEOF_INT; end -= SIZEOF_INT;
} }
} }
while (end > ptr && end[-1] == 0x20) while (end > ptr && end[-1] == 0x20)
end--; end--;
return (end); return (end);
} }
static inline void lex_string_set(LEX_STRING *lex_str, const char *c_str)
{
lex_str->str= (char *) c_str;
lex_str->length= strlen(c_str);
}
#endif #endif
 End of changes. 4 change blocks. 
10 lines changed or deleted 9 lines changed or added


 my_alloc.h   my_alloc.h 
skipping to change at line 26 skipping to change at line 26
/* /*
Data structures for mysys/my_alloc.c (root memory allocator) Data structures for mysys/my_alloc.c (root memory allocator)
*/ */
#ifndef _my_alloc_h #ifndef _my_alloc_h
#define _my_alloc_h #define _my_alloc_h
#define ALLOC_MAX_BLOCK_TO_DROP 4096 #define ALLOC_MAX_BLOCK_TO_DROP 4096
#define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10
#ifdef __cplusplus
extern "C" {
#endif
typedef struct st_used_mem typedef struct st_used_mem
{ /* struct for once_alloc (block) */ { /* struct for once_alloc (block) */
struct st_used_mem *next; /* Next block in use */ struct st_used_mem *next; /* Next block in use */
unsigned int left; /* memory left in block */ unsigned int left; /* memory left in block */
unsigned int size; /* size of block */ unsigned int size; /* size of block */
} USED_MEM; } USED_MEM;
typedef struct st_mem_root typedef struct st_mem_root
{ {
USED_MEM *free; /* blocks with free memory in it */ USED_MEM *free; /* blocks with free memory in it */
skipping to change at line 50 skipping to change at line 54
size_t block_size; /* initial block size */ size_t block_size; /* initial block size */
unsigned int block_num; /* allocated blocks counter */ unsigned int block_num; /* allocated blocks counter */
/* /*
first free block in queue test counter (if it exceed first free block in queue test counter (if it exceed
MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list) MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
*/ */
unsigned int first_block_usage; unsigned int first_block_usage;
void (*error_handler)(void); void (*error_handler)(void);
} MEM_ROOT; } MEM_ROOT;
#ifdef __cplusplus
}
#endif
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 my_config.h   my_config.h 
skipping to change at line 25 skipping to change at line 25
#ifndef MY_CONFIG_H #ifndef MY_CONFIG_H
#define MY_CONFIG_H #define MY_CONFIG_H
#define DOT_FRM_VERSION 6 #define DOT_FRM_VERSION 6
/* Headers we may want to use. */ /* Headers we may want to use. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#define HAVE_ALLOCA_H 1 #define HAVE_ALLOCA_H 1
#define HAVE_AIO_H 1 #define HAVE_AIO_H 1
#define HAVE_ARPA_INET_H 1 #define HAVE_ARPA_INET_H 1
#define HAVE_ASM_MSR_H 1
#define HAVE_ASM_TERMBITS_H 1
#define HAVE_BSEARCH 1 #define HAVE_BSEARCH 1
#define HAVE_CRYPT_H 1 #define HAVE_CRYPT_H 1
#define HAVE_CURSES_H 1 #define HAVE_CURSES_H 1
/* #undef HAVE_CXXABI_H */ /* #undef HAVE_CXXABI_H */
/* #undef HAVE_NCURSES_H */ /* #undef HAVE_NCURSES_H */
/* #undef HAVE_NDIR_H */
#define HAVE_DIRENT_H 1 #define HAVE_DIRENT_H 1
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
#define HAVE_EXECINFO_H 1 #define HAVE_EXECINFO_H 1
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
#define HAVE_FENV_H 1 #define HAVE_FENV_H 1
#define HAVE_FLOAT_H 1 #define HAVE_FLOAT_H 1
/* #undef HAVE_FLOATINGPOINT_H */ /* #undef HAVE_FLOATINGPOINT_H */
#define HAVE_FNMATCH_H 1 #define HAVE_FNMATCH_H 1
#define HAVE_FPU_CONTROL_H 1 #define HAVE_FPU_CONTROL_H 1
#define HAVE_GRP_H 1 #define HAVE_GRP_H 1
#define HAVE_EXPLICIT_TEMPLATE_INSTANTIATION 1 #define HAVE_EXPLICIT_TEMPLATE_INSTANTIATION 1
/* #undef HAVE_IA64INTRIN_H */
/* #undef HAVE_IEEEFP_H */ /* #undef HAVE_IEEEFP_H */
#define HAVE_INTTYPES_H 1 #define HAVE_INTTYPES_H 1
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
#define HAVE_LOCALE_H 1 #define HAVE_LOCALE_H 1
#define HAVE_MALLOC_H 1 #define HAVE_MALLOC_H 1
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
#define HAVE_NETINET_IN_H 1 #define HAVE_NETINET_IN_H 1
#define HAVE_PATHS_H 1 #define HAVE_PATHS_H 1
#define HAVE_POLL_H 1 #define HAVE_POLL_H 1
/* #undef HAVE_PORT_H */ /* #undef HAVE_PORT_H */
skipping to change at line 72 skipping to change at line 76
/* #undef HAVE_SYNCH_H */ /* #undef HAVE_SYNCH_H */
/* #undef HAVE_SYSENT_H */ /* #undef HAVE_SYSENT_H */
#define HAVE_SYS_DIR_H 1 #define HAVE_SYS_DIR_H 1
#define HAVE_SYS_CDEFS_H 1 #define HAVE_SYS_CDEFS_H 1
#define HAVE_SYS_FILE_H 1 #define HAVE_SYS_FILE_H 1
/* #undef HAVE_SYS_FPU_H */ /* #undef HAVE_SYS_FPU_H */
#define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_IOCTL_H 1
#define HAVE_SYS_IPC_H 1 #define HAVE_SYS_IPC_H 1
/* #undef HAVE_SYS_MALLOC_H */ /* #undef HAVE_SYS_MALLOC_H */
#define HAVE_SYS_MMAN_H 1 #define HAVE_SYS_MMAN_H 1
/* #undef HAVE_SYS_NDIR_H */
/* #undef HAVE_SYS_PTE_H */ /* #undef HAVE_SYS_PTE_H */
/* #undef HAVE_SYS_PTEM_H */ /* #undef HAVE_SYS_PTEM_H */
#define HAVE_SYS_PRCTL_H 1 #define HAVE_SYS_PRCTL_H 1
#define HAVE_SYS_RESOURCE_H 1 #define HAVE_SYS_RESOURCE_H 1
#define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_SELECT_H 1
#define HAVE_SYS_SHM_H 1 #define HAVE_SYS_SHM_H 1
#define HAVE_SYS_SOCKET_H 1 #define HAVE_SYS_SOCKET_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
/* #undef HAVE_SYS_STREAM_H */ /* #undef HAVE_SYS_STREAM_H */
/* #undef HAVE_SYS_TERMCAP_H */ /* #undef HAVE_SYS_TERMCAP_H */
#define HAVE_SYS_TIMEB_H 1 #define HAVE_SYS_TIMEB_H 1
#define HAVE_SYS_TIMES_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_UN_H 1 #define HAVE_SYS_UN_H 1
/* #undef HAVE_SYS_VADVISE_H */ /* #undef HAVE_SYS_VADVISE_H */
#define HAVE_TERM_H 1 #define HAVE_TERM_H 1
/* #undef HAVE_TERMBITS_H */
#define HAVE_TERMIOS_H 1 #define HAVE_TERMIOS_H 1
#define HAVE_TERMIO_H 1 #define HAVE_TERMIO_H 1
#define HAVE_TERMCAP_H 1 #define HAVE_TERMCAP_H 1
#define HAVE_TIME_H 1
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#define HAVE_UTIME_H 1 #define HAVE_UTIME_H 1
/* #undef HAVE_VARARGS_H */ /* #undef HAVE_VARARGS_H */
/* #undef HAVE_VIS_H */ /* #undef HAVE_VIS_H */
/* #undef HAVE_SYS_UTIME_H */ /* #undef HAVE_SYS_UTIME_H */
#define HAVE_SYS_WAIT_H 1 #define HAVE_SYS_WAIT_H 1
#define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_PARAM_H 1
/* #undef HAVE_XFS_XFS_H */
/* Libraries */ /* Libraries */
/* #undef HAVE_LIBPTHREAD */ /* #undef HAVE_LIBPTHREAD */
/* #undef HAVE_LIBM */ #define HAVE_LIBM 1
/* #undef HAVE_LIBDL */ #define HAVE_LIBDL 1
/* #undef HAVE_LIBRT */ #define HAVE_LIBRT 1
/* #undef HAVE_LIBSOCKET */ /* #undef HAVE_LIBSOCKET */
/* #undef HAVE_LIBNSL */ /* #undef HAVE_LIBNSL */
/* #undef HAVE_LIBCRYPT */ #define HAVE_LIBCRYPT 1
/* #undef HAVE_LIBMTMALLOC */ /* #undef HAVE_LIBMTMALLOC */
/* #undef HAVE_LIBWRAP */ /* #undef HAVE_LIBWRAP */
/* Does "struct timespec" have a "sec" and "nsec" field? */ /* Does "struct timespec" have a "sec" and "nsec" field? */
/* #undef HAVE_TIMESPEC_TS_SEC */ /* #undef HAVE_TIMESPEC_TS_SEC */
/* Readline */ /* Readline */
#define HAVE_HIST_ENTRY 1 #define HAVE_HIST_ENTRY 1
#define USE_LIBEDIT_INTERFACE 1 #define USE_LIBEDIT_INTERFACE 1
/* #undef USE_NEW_READLINE_INTERFACE */ /* #undef USE_NEW_READLINE_INTERFACE */
skipping to change at line 129 skipping to change at line 139
/* Functions we may want to use. */ /* Functions we may want to use. */
/* #undef HAVE_AIOWAIT */ /* #undef HAVE_AIOWAIT */
#define HAVE_ALARM 1 #define HAVE_ALARM 1
#define HAVE_ALLOCA 1 #define HAVE_ALLOCA 1
#define HAVE_BCMP 1 #define HAVE_BCMP 1
/* #undef HAVE_BFILL */ /* #undef HAVE_BFILL */
/* #undef HAVE_BMOVE */ /* #undef HAVE_BMOVE */
#define HAVE_BZERO 1 #define HAVE_BZERO 1
#define HAVE_INDEX 1 #define HAVE_INDEX 1
#define HAVE_CHOWN 1
#define HAVE_CLOCK_GETTIME 1 #define HAVE_CLOCK_GETTIME 1
#define HAVE_CRYPT 1 #define HAVE_CRYPT 1
#define HAVE_CUSERID 1 #define HAVE_CUSERID 1
#define HAVE_CXX_NEW 1
/* #undef HAVE_DIRECTIO */ /* #undef HAVE_DIRECTIO */
#define HAVE_DLERROR 1 #define HAVE_DLERROR 1
#define HAVE_DLOPEN 1 #define HAVE_DLOPEN 1
/* #undef HAVE_DOPRNT */ /* #undef HAVE_DOPRNT */
#define HAVE_FCHMOD 1 #define HAVE_FCHMOD 1
#define HAVE_FCNTL 1 #define HAVE_FCNTL 1
/* #undef HAVE_FCONVERT */ /* #undef HAVE_FCONVERT */
#define HAVE_FDATASYNC 1 #define HAVE_FDATASYNC 1
#define HAVE_FESETROUND 1 #define HAVE_FESETROUND 1
#define HAVE_FINITE 1 #define HAVE_FINITE 1
/* #undef HAVE_FP_EXCEPT */ /* #undef HAVE_FP_EXCEPT */
/* #undef HAVE_FPSETMASK */ /* #undef HAVE_FPSETMASK */
#define HAVE_FSEEKO 1 #define HAVE_FSEEKO 1
#define HAVE_FSYNC 1 #define HAVE_FSYNC 1
#define HAVE_FTIME 1
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1
#define HAVE_GETCWD 1 #define HAVE_GETCWD 1
#define HAVE_GETHOSTBYADDR_R 1 #define HAVE_GETHOSTBYADDR_R 1
#define HAVE_GETHOSTBYNAME_R 1 #define HAVE_GETHOSTBYNAME_R 1
/* #undef HAVE_GETHRTIME */ /* #undef HAVE_GETHRTIME */
#define HAVE_GETLINE 1 #define HAVE_GETLINE 1
#define HAVE_GETNAMEINFO 1 #define HAVE_GETNAMEINFO 1
#define HAVE_GETPAGESIZE 1 #define HAVE_GETPAGESIZE 1
#define HAVE_GETPASS 1 #define HAVE_GETPASS 1
/* #undef HAVE_GETPASSPHRASE */ /* #undef HAVE_GETPASSPHRASE */
skipping to change at line 175 skipping to change at line 188
/* #undef HAVE_ISSETUGID */ /* #undef HAVE_ISSETUGID */
#define HAVE_ISNAN 1 #define HAVE_ISNAN 1
#define HAVE_ISINF 1 #define HAVE_ISINF 1
#define HAVE_LARGE_PAGE_OPTION 1 #define HAVE_LARGE_PAGE_OPTION 1
#define HAVE_LDIV 1 #define HAVE_LDIV 1
#define HAVE_LRAND48 1 #define HAVE_LRAND48 1
#define HAVE_LOCALTIME_R 1 #define HAVE_LOCALTIME_R 1
#define HAVE_LOG2 1 #define HAVE_LOG2 1
#define HAVE_LONGJMP 1 #define HAVE_LONGJMP 1
#define HAVE_LSTAT 1 #define HAVE_LSTAT 1
#define HAVE_MEMALIGN 1
/* #define HAVE_MLOCK 1 see Bug#54662 */
#define HAVE_NPTL 1 #define HAVE_NPTL 1
#define HAVE_NL_LANGINFO 1 #define HAVE_NL_LANGINFO 1
#define HAVE_MADVISE 1 #define HAVE_MADVISE 1
#define HAVE_DECL_MADVISE 1 #define HAVE_DECL_MADVISE 1
#define HAVE_DECL_TGOTO 1 #define HAVE_DECL_TGOTO 1
/* #undef HAVE_DECL_MHA_MAPSIZE_VA */ /* #undef HAVE_DECL_MHA_MAPSIZE_VA */
#define HAVE_MALLINFO 1 #define HAVE_MALLINFO 1
#define HAVE_MEMCPY 1 #define HAVE_MEMCPY 1
#define HAVE_MEMMOVE 1 #define HAVE_MEMMOVE 1
#define HAVE_MKSTEMP 1 #define HAVE_MKSTEMP 1
#define HAVE_MLOCKALL 1 #define HAVE_MLOCKALL 1
#define HAVE_MMAP 1 #define HAVE_MMAP 1
#define HAVE_MMAP64 1 #define HAVE_MMAP64 1
#define HAVE_PERROR 1 #define HAVE_PERROR 1
#define HAVE_POLL 1 #define HAVE_POLL 1
/* #undef HAVE_PORT_CREATE */ /* #undef HAVE_PORT_CREATE */
#define HAVE_POSIX_FALLOCATE 1 #define HAVE_POSIX_FALLOCATE 1
#define HAVE_PREAD 1 #define HAVE_PREAD 1
#define HAVE_PAUSE_INSTRUCTION 1 #define HAVE_PAUSE_INSTRUCTION 1
/* #undef HAVE_FAKE_PAUSE_INSTRUCTION */ /* #undef HAVE_FAKE_PAUSE_INSTRUCTION */
/* #undef HAVE_RDTSCLL */
/* #undef HAVE_READ_REAL_TIME */
/* #undef HAVE_PTHREAD_ATTR_CREATE */ /* #undef HAVE_PTHREAD_ATTR_CREATE */
#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 #define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
/* #undef HAVE_PTHREAD_ATTR_SETPRIO */ /* #undef HAVE_PTHREAD_ATTR_SETPRIO */
/* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */ /* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */
#define HAVE_PTHREAD_ATTR_SETSCOPE 1 #define HAVE_PTHREAD_ATTR_SETSCOPE 1
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
/* #undef HAVE_PTHREAD_CONDATTR_CREATE */ /* #undef HAVE_PTHREAD_CONDATTR_CREATE */
#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
/* #undef HAVE_PTHREAD_INIT */ /* #undef HAVE_PTHREAD_INIT */
#define HAVE_PTHREAD_KEY_DELETE 1 #define HAVE_PTHREAD_KEY_DELETE 1
skipping to change at line 239 skipping to change at line 256
#define HAVE_SIGADDSET 1 #define HAVE_SIGADDSET 1
#define HAVE_SIGEMPTYSET 1 #define HAVE_SIGEMPTYSET 1
#define HAVE_SIGHOLD 1 #define HAVE_SIGHOLD 1
#define HAVE_SIGSET 1 #define HAVE_SIGSET 1
#define HAVE_SIGSET_T 1 #define HAVE_SIGSET_T 1
#define HAVE_SIGACTION 1 #define HAVE_SIGACTION 1
/* #undef HAVE_SIGTHREADMASK */ /* #undef HAVE_SIGTHREADMASK */
#define HAVE_SIGWAIT 1 #define HAVE_SIGWAIT 1
#define HAVE_SLEEP 1 #define HAVE_SLEEP 1
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
/* Some that currently are not real defines, internal to CMake setup */
/* #define HAVE_FCNTL_NONBLOCK 1 */
/* #define HAVE_FINITE_IN_MATH_H 1 */
/* #define HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 */
/* #undef HAVE_SOCKADDR_STORAGE___SS_FAMILY */
/* #undef HAVE_SOCKET_SIZE_T_AS_int */
/* #undef HAVE_SOCKET_SIZE_T_AS_size_t */
/* #define HAVE_SOCKET_SIZE_T_AS_socklen_t */
/* #define HAVE_SOCKET_TIMEOUT */
#define HAVE_STPCPY 1 #define HAVE_STPCPY 1
#define HAVE_STRERROR 1 #define HAVE_STRERROR 1
#define HAVE_STRCOLL 1 #define HAVE_STRCOLL 1
#define HAVE_STRSIGNAL 1 #define HAVE_STRSIGNAL 1
/* #undef HAVE_STRLCPY */ /* #undef HAVE_STRLCPY */
/* #undef HAVE_STRLCAT */ /* #undef HAVE_STRLCAT */
/* #undef HAVE_FGETLN */ /* #undef HAVE_FGETLN */
#define HAVE_STRNLEN 1 #define HAVE_STRNLEN 1
#define HAVE_STRPBRK 1 #define HAVE_STRPBRK 1
#define HAVE_STRSEP 1 #define HAVE_STRSEP 1
skipping to change at line 263 skipping to change at line 289
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
#define HAVE_STRTOULL 1 #define HAVE_STRTOULL 1
#define HAVE_SHMAT 1 #define HAVE_SHMAT 1
#define HAVE_SHMCTL 1 #define HAVE_SHMCTL 1
#define HAVE_SHMDT 1 #define HAVE_SHMDT 1
#define HAVE_SHMGET 1 #define HAVE_SHMGET 1
/* #undef HAVE_TELL */ /* #undef HAVE_TELL */
#define HAVE_TEMPNAM 1 #define HAVE_TEMPNAM 1
/* #undef HAVE_THR_SETCONCURRENCY */ /* #undef HAVE_THR_SETCONCURRENCY */
/* #undef HAVE_THR_YIELD */ /* #undef HAVE_THR_YIELD */
#define HAVE_TIME 1
#define HAVE_TIMES 1
#define HAVE_VALLOC 1 #define HAVE_VALLOC 1
#define HAVE_VIO_READ_BUFF 1 #define HAVE_VIO_READ_BUFF 1
#define HAVE_VASPRINTF 1 #define HAVE_VASPRINTF 1
#define HAVE_VPRINTF 1 #define HAVE_VPRINTF 1
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
#define HAVE_FTRUNCATE 1 #define HAVE_FTRUNCATE 1
#define HAVE_TZNAME 1 #define HAVE_TZNAME 1
#define HAVE_AIO_READ 1 #define HAVE_AIO_READ 1
/* Symbols we may use */ /* Symbols we may use */
#define HAVE_SYS_ERRLIST 1 #define HAVE_SYS_ERRLIST 1
skipping to change at line 284 skipping to change at line 312
#define HAVE_BSS_START 1 #define HAVE_BSS_START 1
#define HAVE_BACKTRACE 1 #define HAVE_BACKTRACE 1
#define HAVE_BACKTRACE_SYMBOLS 1 #define HAVE_BACKTRACE_SYMBOLS 1
#define HAVE_BACKTRACE_SYMBOLS_FD 1 #define HAVE_BACKTRACE_SYMBOLS_FD 1
/* #undef HAVE_PRINTSTACK */ /* #undef HAVE_PRINTSTACK */
#define HAVE_STRUCT_SOCKADDR_IN6 1 #define HAVE_STRUCT_SOCKADDR_IN6 1
#define HAVE_STRUCT_IN6_ADDR 1 #define HAVE_STRUCT_IN6_ADDR 1
/* #undef HAVE_NETINET_IN6_H */ /* #undef HAVE_NETINET_IN6_H */
#define HAVE_IPV6 1 #define HAVE_IPV6 1
/* #undef ss_family */ /* #undef ss_family */
/* #undef HAVE_SOCKADDR_IN_SIN_LEN */
/* #undef HAVE_SOCKADDR_IN6_SIN6_LEN */
/* #undef HAVE_TIMESPEC_TS_SEC */ /* #undef HAVE_TIMESPEC_TS_SEC */
#define STRUCT_DIRENT_HAS_D_INO 1 #define STRUCT_DIRENT_HAS_D_INO 1
/* #undef STRUCT_DIRENT_HAS_D_NAMLEN */ /* #undef STRUCT_DIRENT_HAS_D_NAMLEN */
#define SPRINTF_RETURNS_INT 1 #define SPRINTF_RETURNS_INT 1
#define USE_MB 1 #define USE_MB 1
#define USE_MB_IDENT 1 #define USE_MB_IDENT 1
/* Types we may use */ /* Types we may use */
#define SIZEOF_CHAR 1
#if SIZEOF_CHAR
# define HAVE_CHAR 1
#endif
#ifdef __APPLE__ #ifdef __APPLE__
/* /*
Special handling required for OSX to support universal binaries that Special handling required for OSX to support universal binaries that
mix 32 and 64 bit architectures. mix 32 and 64 bit architectures.
*/ */
#if(__LP64__) #if(__LP64__)
#define SIZEOF_LONG 8 #define SIZEOF_LONG 8
#else #else
#define SIZEOF_LONG 4 #define SIZEOF_LONG 4
#endif #endif
#define SIZEOF_VOIDP SIZEOF_LONG
#define SIZEOF_CHARP SIZEOF_LONG #define SIZEOF_CHARP SIZEOF_LONG
#define SIZEOF_SIZE_T SIZEOF_LONG #define SIZEOF_SIZE_T SIZEOF_LONG
#else #else
#define SIZEOF_LONG 4 /* No indentation, to fetch the lines from verification scripts */
#define SIZEOF_CHARP 4 #define SIZEOF_LONG 4
#define SIZEOF_SIZE_T 4 #define SIZEOF_VOIDP 4
#define SIZEOF_CHARP 4
#define SIZEOF_SIZE_T 4
#endif #endif
#if SIZEOF_LONG #define SIZEOF_CHAR 1
# define HAVE_LONG 1 #define HAVE_CHAR 1
#endif #define HAVE_LONG 1
#if SIZEOF_CHARP
#define HAVE_CHARP 1 #define HAVE_CHARP 1
#define SIZEOF_VOIDP SIZEOF_CHARP
#endif
#define SIZEOF_SHORT 2 #define SIZEOF_SHORT 2
#if SIZEOF_SHORT #define HAVE_SHORT 1
# define HAVE_SHORT 1
#endif
#define SIZEOF_INT 4 #define SIZEOF_INT 4
#if SIZEOF_INT #define HAVE_INT 1
# define HAVE_INT 1
#endif
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#if SIZEOF_LONG_LONG #define HAVE_LONG_LONG 1
# define HAVE_LONG_LONG 1
#endif
#define SIZEOF_OFF_T 8 #define SIZEOF_OFF_T 8
#if SIZEOF_OFF_T
#define HAVE_OFF_T 1 #define HAVE_OFF_T 1
#endif
#define SIZEOF_SIGSET_T 128 #define SIZEOF_SIGSET_T 128
#if SIZEOF_SIGSET_T
#define HAVE_SIGSET_T 1 #define HAVE_SIGSET_T 1
#endif
#if SIZEOF_SIZE_T
#define HAVE_SIZE_T 1 #define HAVE_SIZE_T 1
#endif
/* #undef SIZEOF_UCHAR */ /* #undef SIZEOF_UCHAR */
#if SIZEOF_UCHAR /* #undef HAVE_UCHAR */
#define HAVE_UCHAR 1
#endif
#define SIZEOF_UINT 4 #define SIZEOF_UINT 4
#if SIZEOF_UINT
#define HAVE_UINT 1 #define HAVE_UINT 1
#endif
#define SIZEOF_ULONG 4 #define SIZEOF_ULONG 4
#if SIZEOF_ULONG
#define HAVE_ULONG 1 #define HAVE_ULONG 1
#endif
/* #undef SIZEOF_INT8 */ /* #undef SIZEOF_INT8 */
#if SIZEOF_INT8 /* #undef HAVE_INT8 */
#define HAVE_INT8 1
#endif
/* #undef SIZEOF_UINT8 */ /* #undef SIZEOF_UINT8 */
#if SIZEOF_UINT8 /* #undef HAVE_UINT8 */
#define HAVE_UINT8 1
#endif
/* #undef SIZEOF_INT16 */ /* #undef SIZEOF_INT16 */
#if SIZEOF_INT16 /* #undef HAVE_INT16 */
# define HAVE_INT16 1
#endif
/* #undef SIZEOF_UINT16 */ /* #undef SIZEOF_UINT16 */
#if SIZEOF_UINT16 /* #undef HAVE_UINT16 */
#define HAVE_UINT16 1
#endif
/* #undef SIZEOF_INT32 */ /* #undef SIZEOF_INT32 */
#if SIZEOF_INT32 /* #undef HAVE_INT32 */
#define HAVE_INT32 1
#endif
/* #undef SIZEOF_UINT32 */ /* #undef SIZEOF_UINT32 */
#if SIZEOF_UINT32 /* #undef HAVE_UINT32 */
#define HAVE_UINT32 1
#endif
#define SIZEOF_U_INT32_T 4 #define SIZEOF_U_INT32_T 4
#if SIZEOF_U_INT32_T
#define HAVE_U_INT32_T 1 #define HAVE_U_INT32_T 1
#endif
/* #undef SIZEOF_INT64 */ /* #undef SIZEOF_INT64 */
#if SIZEOF_INT64 /* #undef HAVE_INT64 */
#define HAVE_INT64 1
#endif
/* #undef SIZEOF_UINT64 */ /* #undef SIZEOF_UINT64 */
#if SIZEOF_UINT64 /* #undef HAVE_UINT64 */
#define HAVE_UINT64 1 /* #undef SIZEOF_BOOL */
#endif /* #undef HAVE_BOOL */
#define SOCKET_SIZE_TYPE socklen_t #define SOCKET_SIZE_TYPE socklen_t
/* #undef SIZEOF_BOOL */
#if SIZEOF_BOOL
#define HAVE_BOOL 1
#endif
#define HAVE_MBSTATE_T #define HAVE_MBSTATE_T
#define MAX_INDEXES 64 #define MAX_INDEXES 64
#define QSORT_TYPE_IS_VOID 1 #define QSORT_TYPE_IS_VOID 1
#define RETQSORTTYPE void #define RETQSORTTYPE void
#define SIGNAL_RETURN_TYPE_IS_VOID 1 #define SIGNAL_RETURN_TYPE_IS_VOID 1
#define RETSIGTYPE void #define RETSIGTYPE void
#if SIGNAL_RETURN_TYPE_IS_VOID
#define VOID_SIGHANDLER 1 #define VOID_SIGHANDLER 1
#endif
#define STRUCT_RLIMIT struct rlimit #define STRUCT_RLIMIT struct rlimit
#ifdef __APPLE__ #ifdef __APPLE__
#if __BIG_ENDIAN #if __BIG_ENDIAN
#define WORDS_BIGENDIAN 1 #define WORDS_BIGENDIAN 1
#endif #endif
#else #else
/* #undef WORDS_BIGENDIAN */ /* #undef WORDS_BIGENDIAN */
#endif #endif
skipping to change at line 515 skipping to change at line 486
#define STACK_DIRECTION -1 #define STACK_DIRECTION -1
#define THREAD 1 #define THREAD 1
#define THREAD_SAFE_CLIENT 1 #define THREAD_SAFE_CLIENT 1
#define SYSTEM_TYPE "Linux" #define SYSTEM_TYPE "Linux"
#define MACHINE_TYPE "i686" #define MACHINE_TYPE "i686"
/* #undef HAVE_DTRACE */ /* #undef HAVE_DTRACE */
/* #undef SIGNAL_WITH_VIO_CLOSE */ #define SIGNAL_WITH_VIO_CLOSE 1
/* Windows stuff, mostly functions, that have Posix analogs but named diffe rently */ /* Windows stuff, mostly functions, that have Posix analogs but named diffe rently */
/* #undef S_IROTH */ /* #undef S_IROTH */
/* #undef S_IFIFO */ /* #undef S_IFIFO */
/* #undef IPPROTO_IPV6 */ /* #undef IPPROTO_IPV6 */
/* #undef IPV6_V6ONLY */ /* #undef IPV6_V6ONLY */
/* #undef sigset_t */ /* #undef sigset_t */
/* #undef mode_t */ /* #undef mode_t */
/* #undef SIGQUIT */ /* #undef SIGQUIT */
/* #undef SIGPIPE */ /* #undef SIGPIPE */
skipping to change at line 539 skipping to change at line 510
/* #undef pclose */ /* #undef pclose */
/* #undef ssize_t */ /* #undef ssize_t */
/* #undef strcasecmp */ /* #undef strcasecmp */
/* #undef strncasecmp */ /* #undef strncasecmp */
/* #undef snprintf */ /* #undef snprintf */
/* #undef strtok_r */ /* #undef strtok_r */
/* #undef strtoll */ /* #undef strtoll */
/* #undef strtoull */ /* #undef strtoull */
/* #undef vsnprintf */ /* #undef vsnprintf */
#if (_MSC_VER > 1310) #if (_MSC_VER > 1310)
#define HAVE_SETENV # define HAVE_SETENV
#define setenv(a,b,c) _putenv_s(a,b) #define setenv(a,b,c) _putenv_s(a,b)
#endif #endif
/* /*
MySQL features MySQL features
*/ */
/* #undef ENABLED_LOCAL_INFILE */ /* #undef ENABLED_LOCAL_INFILE */
#define ENABLED_PROFILING 1 #define ENABLED_PROFILING 1
/* #undef EXTRA_DEBUG */ /* #undef EXTRA_DEBUG */
/* #undef BACKUP_TEST */ /* #undef BACKUP_TEST */
skipping to change at line 564 skipping to change at line 535
#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
#define USE_MB 1 #define USE_MB 1
#define USE_MB_IDENT 1 #define USE_MB_IDENT 1
/* #undef USE_STRCOLL */ /* #undef USE_STRCOLL */
/* This should mean case insensitive file system */ /* This should mean case insensitive file system */
/* #undef FN_NO_CASE_SENSE */ /* #undef FN_NO_CASE_SENSE */
#define HAVE_CHARSET_armscii8 1 #define HAVE_CHARSET_armscii8 1
#define HAVE_CHARSET_ascii #define HAVE_CHARSET_ascii 1
#define HAVE_CHARSET_big5 1 #define HAVE_CHARSET_big5 1
#define HAVE_CHARSET_cp1250 1 #define HAVE_CHARSET_cp1250 1
#define HAVE_CHARSET_cp1251 1 #define HAVE_CHARSET_cp1251 1
#define HAVE_CHARSET_cp1256 1 #define HAVE_CHARSET_cp1256 1
#define HAVE_CHARSET_cp1257 1 #define HAVE_CHARSET_cp1257 1
#define HAVE_CHARSET_cp850 1 #define HAVE_CHARSET_cp850 1
#define HAVE_CHARSET_cp852 1 #define HAVE_CHARSET_cp852 1
#define HAVE_CHARSET_cp866 1 #define HAVE_CHARSET_cp866 1
#define HAVE_CHARSET_cp932 1 #define HAVE_CHARSET_cp932 1
#define HAVE_CHARSET_dec8 1 #define HAVE_CHARSET_dec8 1
skipping to change at line 606 skipping to change at line 577
#define HAVE_CHARSET_ujis 1 #define HAVE_CHARSET_ujis 1
#define HAVE_CHARSET_utf8mb4 1 #define HAVE_CHARSET_utf8mb4 1
/* #undef HAVE_CHARSET_utf8mb3 */ /* #undef HAVE_CHARSET_utf8mb3 */
#define HAVE_CHARSET_utf8 1 #define HAVE_CHARSET_utf8 1
#define HAVE_CHARSET_utf16 1 #define HAVE_CHARSET_utf16 1
#define HAVE_CHARSET_utf32 1 #define HAVE_CHARSET_utf32 1
#define HAVE_UCA_COLLATIONS 1 #define HAVE_UCA_COLLATIONS 1
#define HAVE_COMPRESS 1 #define HAVE_COMPRESS 1
/* /*
Hard coded platform settings
*/
/* This is ugly, but we need lots of tweaks for HP-UX */
/* #undef HPUX11 */
/* #undef DO_NOT_REMOVE_THREAD_WRAPPERS */
/* #undef HAVE_BROKEN_PREAD */
/* #undef HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT */
/* #undef SNPRINTF_RETURN_TRUNC */
/* #undef _INCLUDE_LONGLONG */
/* Mac OS X */
/* #undef SIGNALS_DONT_BREAK_READ */
/* #undef IGNORE_SIGHUP_SIGQUIT */
/* #undef _P1003_1B_VISIBLE */
/* #undef DONT_DECLARE_CXA_PURE_VIRTUAL */
/*
Stuff that always need to be defined (compile breaks without it) Stuff that always need to be defined (compile breaks without it)
*/ */
#define HAVE_SPATIAL 1 #define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1 #define HAVE_RTREE_KEYS 1
#define HAVE_QUERY_CACHE 1 #define HAVE_QUERY_CACHE 1
#define BIG_TABLES 1 #define BIG_TABLES 1
/* /*
Important storage engines (those that really need define Important storage engines (those that really need define
WITH_<ENGINE>_STORAGE_ENGINE for the whole server) WITH_<ENGINE>_STORAGE_ENGINE for the whole server)
*/ */
#define WITH_MYISAM_STORAGE_ENGINE 1 #define WITH_MYISAM_STORAGE_ENGINE 1
#define WITH_MYISAMMRG_STORAGE_ENGINE 1 #define WITH_MYISAMMRG_STORAGE_ENGINE 1
#define WITH_HEAP_STORAGE_ENGINE 1 #define WITH_HEAP_STORAGE_ENGINE 1
#define WITH_CSV_STORAGE_ENGINE 1 #define WITH_CSV_STORAGE_ENGINE 1
#define WITH_PARTITION_STORAGE_ENGINE 1 #define WITH_PARTITION_STORAGE_ENGINE 1
#define WITH_PERFSCHEMA_STORAGE_ENGINE 1 #define WITH_PERFSCHEMA_STORAGE_ENGINE 1
/* #undef WITH_NDBCLUSTER_STORAGE_ENGINE */ /* #undef WITH_NDBCLUSTER_STORAGE_ENGINE */
#if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY) #if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY)
#define HAVE_NDB_BINLOG 1 # define HAVE_NDB_BINLOG 1
#endif #endif
#define DEFAULT_MYSQL_HOME "/home/andrey/upstream-tracker/repository/mysql/ #define DEFAULT_MYSQL_HOME "/usr/local/mysql"
mysql-5.5.4-m3/here" #define SHAREDIR "/usr/local/mysql/share"
#define SHAREDIR "/home/andrey/upstream-tracker/repository/mysql/mysql-5.5. #define DEFAULT_BASEDIR "/usr/local/mysql"
4-m3/here/share/mysql" #define MYSQL_DATADIR "/usr/local/mysql/data"
#define DEFAULT_BASEDIR "/home/andrey/upstream-tracker/repository/mysql/mys #define DEFAULT_CHARSET_HOME "/usr/local/mysql"
ql-5.5.4-m3/here" #define PLUGINDIR "/usr/local/mysql/lib/plugin"
#define MYSQL_DATADIR "/home/andrey/upstream-tracker/repository/mysql/mysql #define DEFAULT_SYSCONFDIR "/usr/local/mysql/etc"
-5.5.4-m3/here/var"
#define DEFAULT_CHARSET_HOME "/home/andrey/upstream-tracker/repository/mysq
l/mysql-5.5.4-m3/here"
#define PLUGINDIR "/home/andrey/upstream-tracker/repository/mysql/mysql-5.5
.4-m3/here/lib/mysql/plugin"
#define DEFAULT_SYSCONFDIR "/home/andrey/upstream-tracker/repository/mysql/
mysql-5.5.4-m3/here/etc"
#define PACKAGE "mysql" #define PACKAGE "mysql"
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "MySQL Server" #define PACKAGE_NAME "MySQL Server"
#define PACKAGE_STRING "MySQL Server 5.5.4-m3" #define PACKAGE_STRING "MySQL Server 5.5.5-m3"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.5.4-m3" #define PACKAGE_VERSION "5.5.5-m3"
#define VERSION "5.5.4-m3" #define VERSION "5.5.5-m3"
#define PROTOCOL_VERSION 10 #define PROTOCOL_VERSION 10
#endif #endif
 End of changes. 57 change blocks. 
107 lines changed or deleted 89 lines changed or added


 my_dbug.h   my_dbug.h 
skipping to change at line 148 skipping to change at line 148
#define DBUG_EXPLAIN(buf,len) #define DBUG_EXPLAIN(buf,len)
#define DBUG_EXPLAIN_INITIAL(buf,len) #define DBUG_EXPLAIN_INITIAL(buf,len)
#define DEBUGGER_OFF do { } while(0) #define DEBUGGER_OFF do { } while(0)
#define DEBUGGER_ON do { } while(0) #define DEBUGGER_ON do { } while(0)
#define DBUG_ABORT() abort() #define DBUG_ABORT() abort()
#define DBUG_CRASH_ENTER(func) #define DBUG_CRASH_ENTER(func)
#define DBUG_CRASH_RETURN(val) do { return(val); } while(0) #define DBUG_CRASH_RETURN(val) do { return(val); } while(0)
#define DBUG_CRASH_VOID_RETURN do { return; } while(0) #define DBUG_CRASH_VOID_RETURN do { return; } while(0)
#endif #endif
#ifdef __cplusplus
#ifdef EXTRA_DEBUG
/**
Sync points allow us to force the server to reach a certain line of code
and block there until the client tells the server it is ok to go on.
The client tells the server to block with SELECT GET_LOCK()
and unblocks it with SELECT RELEASE_LOCK(). Used for debugging difficult
concurrency problems
*/
#define DBUG_SYNC_POINT(lock_name,lock_timeout) \
debug_sync_point(lock_name,lock_timeout)
void debug_sync_point(const char* lock_name, uint lock_timeout);
#else
#define DBUG_SYNC_POINT(lock_name,lock_timeout)
#endif /* EXTRA_DEBUG */
#ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 17 lines changed or added


 my_dir.h   my_dir.h 
skipping to change at line 16 skipping to change at line 16
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifndef _my_dir_h
#define _my_dir_h
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MY_DIR_H #ifndef MY_DIR_H
#define MY_DIR_H #define MY_DIR_H
#include "my_global.h"
#include <sys/stat.h> #include <sys/stat.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Defines for my_dir and my_stat */ /* Defines for my_dir and my_stat */
#define MY_S_IFMT S_IFMT /* type of file */ #define MY_S_IFMT S_IFMT /* type of file */
#define MY_S_IFDIR S_IFDIR /* directory */ #define MY_S_IFDIR S_IFDIR /* directory */
#define MY_S_IFCHR S_IFCHR /* character special */ #define MY_S_IFCHR S_IFCHR /* character special */
#define MY_S_IFBLK S_IFBLK /* block special */ #define MY_S_IFBLK S_IFBLK /* block special */
#define MY_S_IFREG S_IFREG /* regular */ #define MY_S_IFREG S_IFREG /* regular */
#define MY_S_IFIFO S_IFIFO /* fifo */ #define MY_S_IFIFO S_IFIFO /* fifo */
#define MY_S_ISUID S_ISUID /* set user id on execution */ #define MY_S_ISUID S_ISUID /* set user id on execution */
#define MY_S_ISGID S_ISGID /* set group id on execution */ #define MY_S_ISGID S_ISGID /* set group id on execution */
skipping to change at line 104 skipping to change at line 104
*/ */
struct fileinfo *dir_entry; struct fileinfo *dir_entry;
uint number_off_files; uint number_off_files;
} MY_DIR; } MY_DIR;
extern MY_DIR *my_dir(const char *path,myf MyFlags); extern MY_DIR *my_dir(const char *path,myf MyFlags);
extern void my_dirend(MY_DIR *buffer); extern void my_dirend(MY_DIR *buffer);
extern MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags) ; extern MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags) ;
extern int my_fstat(int filenr, MY_STAT *stat_area, myf MyFlags); extern int my_fstat(int filenr, MY_STAT *stat_area, myf MyFlags);
#endif /* MY_DIR_H */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif
#endif /* MY_DIR_H */
 End of changes. 5 change blocks. 
8 lines changed or deleted 6 lines changed or added


 my_getopt.h   my_getopt.h 
skipping to change at line 19 skipping to change at line 19
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifndef _my_getopt_h #ifndef _my_getopt_h
#define _my_getopt_h #define _my_getopt_h
#include "my_sys.h" /* loglevel */
C_MODE_START C_MODE_START
#define GET_NO_ARG 1 #define GET_NO_ARG 1
#define GET_BOOL 2 #define GET_BOOL 2
#define GET_INT 3 #define GET_INT 3
#define GET_UINT 4 #define GET_UINT 4
#define GET_LONG 5 #define GET_LONG 5
#define GET_ULONG 6 #define GET_ULONG 6
#define GET_LL 7 #define GET_LL 7
#define GET_ULL 8 #define GET_ULL 8
skipping to change at line 65 skipping to change at line 67
my_get_one_option() callback. my_get_one_option() callback.
If an opton needs neither specia l If an opton needs neither specia l
treatment in the my_get_one_opti on() treatment in the my_get_one_opti on()
nor one-letter short equivalent nor one-letter short equivalent
use id=0 use id=0
*/ */
const char *comment; /**< option comment, for autom. --h elp. const char *comment; /**< option comment, for autom. --h elp.
if it's NULL the option is not if it's NULL the option is not
visible in --help. visible in --help.
*/ */
uchar **value; /**< A pointer to the variable valu void *value; /**< A pointer to the variable valu
e */ e */
uchar **u_max_value; /**< The user def. max variable val void *u_max_value; /**< The user def. max variable val
ue */ ue */
struct st_typelib *typelib; /**< Pointer to possible values */ struct st_typelib *typelib; /**< Pointer to possible values */
ulong var_type; /**< GET_BOOL, GET_ULL, etc */ ulong var_type; /**< GET_BOOL, GET_ULL, etc */
enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG * / enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG * /
longlong def_value; /**< Default value */ longlong def_value; /**< Default value */
longlong min_value; /**< Min allowed value (for numbers ) */ longlong min_value; /**< Min allowed value (for numbers ) */
longlong max_value; /**< Max allowed value (for numbers ) */ longlong max_value; /**< Max allowed value (for numbers ) */
longlong sub_size; /**< Unused */ longlong sub_size; /**< Unused */
long block_size; /**< Value should be a mult. of thi s (for numbers) */ long block_size; /**< Value should be a mult. of thi s (for numbers) */
void *app_type; /**< To be used by an application * / void *app_type; /**< To be used by an application * /
}; };
typedef my_bool (*my_get_one_option) (int, const struct my_option *, char * typedef my_bool (*my_get_one_option)(int, const struct my_option *, char *)
); ;
typedef void (*my_error_reporter) (enum loglevel level, const char *format, typedef void (*my_error_reporter)(enum loglevel level, const char *format,
... ); ...);
/**
Used to retrieve a reference to the object (variable) that holds the valu
e
for the given option. For example, if var_type is GET_UINT, the function
must return a pointer to a variable of type uint. A argument is stored in
the location pointed to by the returned pointer.
*/
typedef void *(*my_getopt_value)(const char *, uint, const struct my_option
*,
int *);
extern char *disabled_my_option; extern char *disabled_my_option;
extern my_bool my_getopt_print_errors; extern my_bool my_getopt_print_errors;
extern my_bool my_getopt_skip_unknown; extern my_bool my_getopt_skip_unknown;
extern my_error_reporter my_getopt_error_reporter; extern my_error_reporter my_getopt_error_reporter;
extern int handle_options (int *argc, char ***argv, extern int handle_options (int *argc, char ***argv,
const struct my_option *longopts, my_get_one_opti on); const struct my_option *longopts, my_get_one_opti on);
extern void my_cleanup_options(const struct my_option *options); extern void my_cleanup_options(const struct my_option *options);
extern void my_print_help(const struct my_option *options); extern void my_print_help(const struct my_option *options);
extern void my_print_variables(const struct my_option *options); extern void my_print_variables(const struct my_option *options);
extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, extern void my_getopt_register_get_addr(my_getopt_value);
uint,
const struct my_option *, int *));
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *opt p, ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *opt p,
my_bool *fix); my_bool *fix);
longlong getopt_ll_limit_value(longlong, const struct my_option *, longlong getopt_ll_limit_value(longlong, const struct my_option *,
my_bool *fix); my_bool *fix);
double getopt_double_limit_value(double num, const struct my_option *optp, double getopt_double_limit_value(double num, const struct my_option *optp,
my_bool *fix); my_bool *fix);
my_bool getopt_compare_strings(const char *s, const char *t, uint length); my_bool getopt_compare_strings(const char *s, const char *t, uint length);
C_MODE_END C_MODE_END
 End of changes. 4 change blocks. 
11 lines changed or deleted 21 lines changed or added


 my_global.h   my_global.h 
skipping to change at line 21 skipping to change at line 21
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* This is the include file that should be included 'first' in every C file . */ /* This is the include file that should be included 'first' in every C file . */
#ifndef _global_h #ifndef _global_h
#define _global_h #define _global_h
/* Client library users on Windows need this macro defined here. */
#if !defined(__WIN__) && defined(_WIN32)
#define __WIN__
#endif
/* /*
InnoDB depends on some MySQL internals which other plugins should not InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog need. This is because of InnoDB's foreign key support, "safe" binlog
truncation, and other similar legacy features. truncation, and other similar legacy features.
We define accessors for these internals unconditionally, but do not We define accessors for these internals unconditionally, but do not
expose them in mysql/plugin.h. They are declared in ha_innodb.h for expose them in mysql/plugin.h. They are declared in ha_innodb.h for
InnoDB's use. InnoDB's use.
*/ */
#define INNODB_COMPATIBILITY_HOOKS #define INNODB_COMPATIBILITY_HOOKS
skipping to change at line 57 skipping to change at line 62
Must be defined before including Must be defined before including
"sys/select.h" and "sys/time.h" "sys/select.h" and "sys/time.h"
*/ */
#endif #endif
/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */ /* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
#ifdef USE_PRAGMA_IMPLEMENTATION #ifdef USE_PRAGMA_IMPLEMENTATION
#define USE_PRAGMA_INTERFACE #define USE_PRAGMA_INTERFACE
#endif #endif
#if defined(__OpenBSD__) && (OpenBSD >= 200411)
#define HAVE_ERRNO_AS_DEFINE
#endif
#if defined(i386) && !defined(__i386__) #if defined(i386) && !defined(__i386__)
#define __i386__ #define __i386__
#endif #endif
/* Macros to make switching between C and C++ mode easier */ /* Macros to make switching between C and C++ mode easier */
#ifdef __cplusplus #ifdef __cplusplus
#define C_MODE_START extern "C" { #define C_MODE_START extern "C" {
#define C_MODE_END } #define C_MODE_END }
#else #else
#define C_MODE_START #define C_MODE_START
#define C_MODE_END #define C_MODE_END
#endif #endif
#ifdef __cplusplus
#define CPP_UNNAMED_NS_START namespace {
#define CPP_UNNAMED_NS_END }
#endif
#if defined(_WIN32) #if defined(_WIN32)
#include <my_config.h> #include <my_config.h>
#elif defined(__NETWARE__) #elif defined(__NETWARE__)
#include <my_config.h> #include <my_config.h>
#include <config-netware.h> #include <config-netware.h>
#if defined(__cplusplus) && defined(inline) #if defined(__cplusplus) && defined(inline)
#undef inline /* fix configure problem */ #undef inline /* fix configure problem */
#endif #endif
#else #else
#include <my_config.h> #include <my_config.h>
skipping to change at line 854 skipping to change at line 868
For Posix , my_file_info array is only used to store filenames for For Posix , my_file_info array is only used to store filenames for
error reporting and its size is not a limitation for number of open files . error reporting and its size is not a limitation for number of open files .
*/ */
#ifdef _WIN32 #ifdef _WIN32
#define MY_NFILE (16384 + MY_FILE_MIN) #define MY_NFILE (16384 + MY_FILE_MIN)
#else #else
#define MY_NFILE 64 #define MY_NFILE 64
#endif #endif
#ifndef OS_FILE_LIMIT #ifndef OS_FILE_LIMIT
#define OS_FILE_LIMIT 65535 #define OS_FILE_LIMIT UINT_MAX
#endif #endif
/* #define EXT_IN_LIBNAME */ /* #define EXT_IN_LIBNAME */
/* #define FN_NO_CASE_SENSE */ /* #define FN_NO_CASE_SENSE */
/* #define FN_UPPER_CASE TRUE */ /* #define FN_UPPER_CASE TRUE */
/* /*
Io buffer size; Must be a power of 2 and a multiple of 512. May be Io buffer size; Must be a power of 2 and a multiple of 512. May be
smaller what the disk page size. This influences the speed of the smaller what the disk page size. This influences the speed of the
isam btree library. eg to big to slow. isam btree library. eg to big to slow.
skipping to change at line 1060 skipping to change at line 1074
/* Size to make adressable obj. */ /* Size to make adressable obj. */
#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t))) #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t)))
/* Offset of field f in structure t */ /* Offset of field f in structure t */
#define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) #define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f)
#define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size) #define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B)) #define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))
#define MY_DIV_UP(A, B) (((A) + (B) - 1) / (B)) #define MY_DIV_UP(A, B) (((A) + (B) - 1) / (B))
#define MY_ALIGNED_BYTE_ARRAY(N, S, T) T N[MY_DIV_UP(S, sizeof(T))] #define MY_ALIGNED_BYTE_ARRAY(N, S, T) T N[MY_DIV_UP(S, sizeof(T))]
#ifdef __cplusplus
template <size_t sz> struct Aligned_char_array
{
union {
void *v; // Ensures alignment.
char arr[sz]; // The actual buffer.
} u;
void* arr() { return &u.arr[0]; }
};
#endif /* __cplusplus */
/* /*
Custom version of standard offsetof() macro which can be used to get Custom version of standard offsetof() macro which can be used to get
offsets of members in class for non-POD types (according to the current offsets of members in class for non-POD types (according to the current
version of C++ standard offsetof() macro can't be used in such cases and version of C++ standard offsetof() macro can't be used in such cases and
attempt to do so causes warnings to be emitted, OTOH in many cases it is attempt to do so causes warnings to be emitted, OTOH in many cases it is
still OK to assume that all instances of the class has the same offsets still OK to assume that all instances of the class has the same offsets
for the same members). for the same members).
This is temporary solution which should be removed once File_parser class This is temporary solution which should be removed once File_parser class
and related routines are refactored. and related routines are refactored.
skipping to change at line 1084 skipping to change at line 1109
#define NullS (char *) 0 #define NullS (char *) 0
/* Nowdays we do not support MessyDos */ /* Nowdays we do not support MessyDos */
#ifndef NEAR #ifndef NEAR
#define NEAR /* Who needs segments ? */ #define NEAR /* Who needs segments ? */
#define FAR /* On a good machine */ #define FAR /* On a good machine */
#ifndef HUGE_PTR #ifndef HUGE_PTR
#define HUGE_PTR #define HUGE_PTR
#endif #endif
#endif #endif
#if defined(__IBMC__) || defined(__IBMCPP__)
/* This was _System _Export but caused a lot of warnings on _AIX43 */ #ifdef STDCALL
#define STDCALL #undef STDCALL
#elif !defined( STDCALL) #endif
#ifdef _WIN32
#define STDCALL __stdcall
#else
#define STDCALL #define STDCALL
#endif #endif
/* Typdefs for easyier portability */ /* Typdefs for easyier portability */
#ifndef HAVE_UCHAR #ifndef HAVE_UCHAR
typedef unsigned char uchar; /* Short for unsigned char */ typedef unsigned char uchar; /* Short for unsigned char */
#endif #endif
#ifndef HAVE_INT8 #ifndef HAVE_INT8
skipping to change at line 1200 skipping to change at line 1229
#else #else
typedef off_t os_off_t; typedef off_t os_off_t;
#if SIZEOF_OFF_T > 4 #if SIZEOF_OFF_T > 4
typedef ulonglong my_off_t; typedef ulonglong my_off_t;
#else #else
typedef unsigned long my_off_t; typedef unsigned long my_off_t;
#endif #endif
#endif /*_WIN32*/ #endif /*_WIN32*/
#define MY_FILEPOS_ERROR (~(my_off_t) 0) #define MY_FILEPOS_ERROR (~(my_off_t) 0)
/*
TODO Convert these to use Bitmap class.
*/
typedef ulonglong table_map; /* Used for table bits in join */
typedef ulong nesting_map; /* Used for flags of nesting constructs */
#if defined(__WIN__) #if defined(__WIN__)
#define socket_errno WSAGetLastError() #define socket_errno WSAGetLastError()
#define SOCKET_EINTR WSAEINTR #define SOCKET_EINTR WSAEINTR
#define SOCKET_EAGAIN WSAEINPROGRESS #define SOCKET_EAGAIN WSAEINPROGRESS
#define SOCKET_ETIMEDOUT WSAETIMEDOUT #define SOCKET_ETIMEDOUT WSAETIMEDOUT
#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
#define SOCKET_EADDRINUSE WSAEADDRINUSE #define SOCKET_EADDRINUSE WSAEADDRINUSE
#define SOCKET_ENFILE ENFILE #define SOCKET_ENFILE ENFILE
#define SOCKET_EMFILE EMFILE #define SOCKET_EMFILE EMFILE
#else /* Unix */ #else /* Unix */
skipping to change at line 1668 skipping to change at line 1703
#define MY_INT32_NUM_DECIMAL_DIGITS 11 #define MY_INT32_NUM_DECIMAL_DIGITS 11
/* Length of decimal number represented by INT64. */ /* Length of decimal number represented by INT64. */
#define MY_INT64_NUM_DECIMAL_DIGITS 21 #define MY_INT64_NUM_DECIMAL_DIGITS 21
/* Define some useful general macros (should be done after all headers). */ /* Define some useful general macros (should be done after all headers). */
#if !defined(max) #if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))
#define min(a, b) ((a) < (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))
#endif #endif
#define x_free(A) \
do { my_free((uchar*)(A), MYF(MY_WME|MY_FAE|MY_ALLOW_ZERO_PTR)); } while
(0)
#define safeFree(X) \
do { if (X) { my_free((uchar*)(X), MYF(0)); (X) = NULL; } } while (0)
/* /*
Only Linux is known to need an explicit sync of the directory to make sur e a Only Linux is known to need an explicit sync of the directory to make sur e a
file creation/deletion/renaming in(from,to) this directory durable. file creation/deletion/renaming in(from,to) this directory durable.
*/ */
#ifdef TARGET_OS_LINUX #ifdef TARGET_OS_LINUX
#define NEED_EXPLICIT_SYNC_DIR 1 #define NEED_EXPLICIT_SYNC_DIR 1
#endif #endif
#if !defined(__cplusplus) && !defined(bool) #if !defined(__cplusplus) && !defined(bool)
#define bool In_C_you_should_use_my_bool_instead() #define bool In_C_you_should_use_my_bool_instead()
skipping to change at line 1747 skipping to change at line 1788
Outside of Windows, it is dummy. Outside of Windows, it is dummy.
*/ */
#ifndef MYSQL_PLUGIN_IMPORT #ifndef MYSQL_PLUGIN_IMPORT
#if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN)) #if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN))
#define MYSQL_PLUGIN_IMPORT __declspec(dllimport) #define MYSQL_PLUGIN_IMPORT __declspec(dllimport)
#else #else
#define MYSQL_PLUGIN_IMPORT #define MYSQL_PLUGIN_IMPORT
#endif #endif
#endif #endif
/* Defines that are unique to the embedded version of MySQL */
#ifdef EMBEDDED_LIBRARY
/* Things we don't need in the embedded version of MySQL */
/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library
*/
#undef HAVE_PSTACK /* No stacktrace */
#undef HAVE_OPENSSL
#undef HAVE_SMEM /* No shared memory */
#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
#define DONT_USE_RAID
#endif /* EMBEDDED_LIBRARY */
#endif /* my_global_h */ #endif /* my_global_h */
 End of changes. 9 change blocks. 
5 lines changed or deleted 64 lines changed or added


 my_net.h   my_net.h 
skipping to change at line 27 skipping to change at line 27
thread safe version of some common functions: thread safe version of some common functions:
my_inet_ntoa my_inet_ntoa
This file is also used to make handling of sockets and ioctl() This file is also used to make handling of sockets and ioctl()
portable accross systems. portable accross systems.
*/ */
#ifndef _my_net_h #ifndef _my_net_h
#define _my_net_h #define _my_net_h
#include "my_global.h" /* C_MODE_START, C_MODE_END */
C_MODE_START C_MODE_START
#include <errno.h> #include <errno.h>
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 my_pthread.h   my_pthread.h 
skipping to change at line 21 skipping to change at line 21
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* Defines to make different thread packages compatible */ /* Defines to make different thread packages compatible */
#ifndef _my_pthread_h #ifndef _my_pthread_h
#define _my_pthread_h #define _my_pthread_h
#include "my_global.h" /* myf */
#ifndef ETIME #ifndef ETIME
#define ETIME ETIMEDOUT /* For FreeBSD */ #define ETIME ETIMEDOUT /* For FreeBSD */
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERNC extern "C" #define EXTERNC extern "C"
extern "C" { extern "C" {
#else #else
#define EXTERNC #define EXTERNC
#endif /* __cplusplus */ #endif /* __cplusplus */
skipping to change at line 705 skipping to change at line 707
typedef ulong my_thread_id; typedef ulong my_thread_id;
extern my_bool my_thread_global_init(void); extern my_bool my_thread_global_init(void);
extern my_bool my_thread_basic_global_init(void); extern my_bool my_thread_basic_global_init(void);
extern void my_thread_basic_global_reinit(void); extern void my_thread_basic_global_reinit(void);
extern void my_thread_global_end(void); extern void my_thread_global_end(void);
extern my_bool my_thread_init(void); extern my_bool my_thread_init(void);
extern void my_thread_end(void); extern void my_thread_end(void);
extern const char *my_thread_name(void); extern const char *my_thread_name(void);
extern my_thread_id my_thread_dbug_id(void); extern my_thread_id my_thread_dbug_id(void);
extern int pthread_no_free(void *);
extern int pthread_dummy(int); extern int pthread_dummy(int);
/* All thread specific variables are in the following struct */ /* All thread specific variables are in the following struct */
#define THREAD_NAME_SIZE 10 #define THREAD_NAME_SIZE 10
#ifndef DEFAULT_THREAD_STACK #ifndef DEFAULT_THREAD_STACK
#if SIZEOF_CHARP > 4 #if SIZEOF_CHARP > 4
/* /*
MySQL can survive with 32K, but some glibc libraries require > 128K stack MySQL can survive with 32K, but some glibc libraries require > 128K stack
To resolve hostnames. Also recursive stored procedures needs stack. To resolve hostnames. Also recursive stored procedures needs stack.
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 my_sys.h   my_sys.h 
skipping to change at line 18 skipping to change at line 18
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifndef _my_sys_h #ifndef _my_sys_h
#define _my_sys_h #define _my_sys_h
#include "my_global.h" /* C_MODE_START, C_MODE_END */
C_MODE_START C_MODE_START
#ifdef HAVE_AIOWAIT #ifdef HAVE_AIOWAIT
#include <sys/asynch.h> /* Used by record-cache */ #include <sys/asynch.h> /* Used by record-cache */
typedef struct my_aio_result { typedef struct my_aio_result {
aio_result_t result; aio_result_t result;
int pending; int pending;
} my_aio_result; } my_aio_result;
#endif #endif
#ifdef HAVE_VALGRIND
# include <valgrind/memcheck.h>
# define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
# define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
# define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,l
en)
# define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
#else /* HAVE_VALGRIND */
# define MEM_UNDEFINED(a,len) ((void) 0)
# define MEM_NOACCESS(a,len) ((void) 0)
# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
# define MEM_CHECK_DEFINED(a,len) ((void) 0)
#endif /* HAVE_VALGRIND */
#ifndef THREAD #ifndef THREAD
extern int NEAR my_errno; /* Last error in mysys */ extern int NEAR my_errno; /* Last error in mysys */
#else #else
#include <my_pthread.h> #include <my_pthread.h>
#endif #endif
#include <m_ctype.h> /* for CHARSET_INFO */ #include <m_ctype.h> /* for CHARSET_INFO */
#include <stdarg.h> #include <stdarg.h>
#include <typelib.h> #include <typelib.h>
#ifdef _WIN32 #ifdef _WIN32
#include <malloc.h> /*for alloca*/ #include <malloc.h> /*for alloca*/
#endif #endif
#define MYSYS_PROGRAM_USES_CURSES() { error_handler_hook = my_message_curs #define MY_INIT(name) { my_progname= name; my_init(); }
es; mysys_uses_curses=1; }
#define MYSYS_PROGRAM_DONT_USE_CURSES() { error_handler_hook = my_message_
no_curses; mysys_uses_curses=0;}
#define MY_INIT(name); { my_progname= name; my_init(); }
/** /**
Max length of an error message generated by mysys utilities. Max length of an error message generated by mysys utilities.
Some mysys functions produce error messages. These mostly go Some mysys functions produce error messages. These mostly go
to stderr. to stderr.
This constant defines the size of the buffer used to format This constant defines the size of the buffer used to format
the message. It should be kept in sync with MYSQL_ERRMSG_SIZE, the message. It should be kept in sync with MYSQL_ERRMSG_SIZE,
since sometimes mysys errors are stored in the server diagnostics since sometimes mysys errors are stored in the server diagnostics
area, and we would like to avoid unexpected truncation. area, and we would like to avoid unexpected truncation.
*/ */
skipping to change at line 155 skipping to change at line 169
/* defines when allocating data */ /* defines when allocating data */
#ifdef SAFEMALLOC #ifdef SAFEMALLOC
#define my_malloc(SZ,FLAG) _mymalloc((SZ), __FILE__, __LINE__, FLAG ) #define my_malloc(SZ,FLAG) _mymalloc((SZ), __FILE__, __LINE__, FLAG )
#define my_malloc_ci(SZ,FLAG) _mymalloc((SZ), sFile, uLine, FLAG ) #define my_malloc_ci(SZ,FLAG) _mymalloc((SZ), sFile, uLine, FLAG )
#define my_realloc(PTR,SZ,FLAG) _myrealloc((PTR), (SZ), __FILE__, __LINE__, FLAG ) #define my_realloc(PTR,SZ,FLAG) _myrealloc((PTR), (SZ), __FILE__, __LINE__, FLAG )
#define my_checkmalloc() _sanity( __FILE__, __LINE__ ) #define my_checkmalloc() _sanity( __FILE__, __LINE__ )
#define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG) #define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)
#define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C) #define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
#define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C) #define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
#define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C) #define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
#define TRASH(A,B) bfill(A, B, 0x8F) #define TRASH(A,B) do { bfill(A, B, 0x8F); MEM_UNDEFINED(A, B); } while (0)
#define QUICK_SAFEMALLOC sf_malloc_quick=1 #define QUICK_SAFEMALLOC sf_malloc_quick=1
#define NORMAL_SAFEMALLOC sf_malloc_quick=0 #define NORMAL_SAFEMALLOC sf_malloc_quick=0
extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick; extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
extern ulonglong sf_malloc_mem_limit; extern ulonglong sf_malloc_mem_limit;
#define CALLER_INFO_PROTO , const char *sFile, uint uLine #define CALLER_INFO_PROTO , const char *sFile, uint uLine
#define CALLER_INFO , __FILE__, __LINE__ #define CALLER_INFO , __FILE__, __LINE__
#define ORIG_CALLER_INFO , sFile, uLine #define ORIG_CALLER_INFO , sFile, uLine
#else #else
#define my_checkmalloc() #define my_checkmalloc()
skipping to change at line 183 skipping to change at line 197
extern void my_no_flags_free(void *ptr); extern void my_no_flags_free(void *ptr);
extern void *my_memdup(const void *from,size_t length,myf MyFlags); extern void *my_memdup(const void *from,size_t length,myf MyFlags);
extern char *my_strdup(const char *from,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags);
extern char *my_strndup(const char *from, size_t length, extern char *my_strndup(const char *from, size_t length,
myf MyFlags); myf MyFlags);
/* we do use FG (as a no-op) in below so that a typo on FG is caught */ /* we do use FG (as a no-op) in below so that a typo on FG is caught */
#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR)) #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
#define CALLER_INFO_PROTO /* nothing */ #define CALLER_INFO_PROTO /* nothing */
#define CALLER_INFO /* nothing */ #define CALLER_INFO /* nothing */
#define ORIG_CALLER_INFO /* nothing */ #define ORIG_CALLER_INFO /* nothing */
#define TRASH(A,B) /* nothing */ #define TRASH(A,B) do{MEM_CHECK_ADDRESSABLE(A,B);MEM_UNDEFINED(A,B);} while (0)
#endif #endif
#if defined(ENABLED_DEBUG_SYNC) #if defined(ENABLED_DEBUG_SYNC)
extern void (*debug_sync_C_callback_ptr)(const char *, size_t); extern void (*debug_sync_C_callback_ptr)(const char *, size_t);
#define DEBUG_SYNC_C(_sync_point_name_) do { \ #define DEBUG_SYNC_C(_sync_point_name_) do { \
if (debug_sync_C_callback_ptr != NULL) \ if (debug_sync_C_callback_ptr != NULL) \
(*debug_sync_C_callback_ptr)(STRING_WITH_LEN(_sync_point_name_)); } \ (*debug_sync_C_callback_ptr)(STRING_WITH_LEN(_sync_point_name_)); } \
while(0) while(0)
#else #else
#define DEBUG_SYNC_C(_sync_point_name_) #define DEBUG_SYNC_C(_sync_point_name_)
skipping to change at line 271 skipping to change at line 285
extern void (*my_sigtstp_cleanup)(void), extern void (*my_sigtstp_cleanup)(void),
/* Executed before jump to shell */ /* Executed before jump to shell */
(*my_sigtstp_restart)(void), (*my_sigtstp_restart)(void),
(*my_abort_hook)(int); (*my_abort_hook)(int);
/* Executed when comming from shell */ /* Executed when comming from shell */
extern MYSQL_PLUGIN_IMPORT int NEAR my_umask; /* Default creation mask */ extern MYSQL_PLUGIN_IMPORT int NEAR my_umask; /* Default creation mask */
extern int NEAR my_umask_dir, extern int NEAR my_umask_dir,
NEAR my_recived_signals, /* Signals we have got */ NEAR my_recived_signals, /* Signals we have got */
NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
NEAR my_dont_interrupt; /* call remember_intr when set */ NEAR my_dont_interrupt; /* call remember_intr when set */
extern my_bool NEAR mysys_uses_curses, my_use_symdir; extern my_bool NEAR my_use_symdir;
extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;
extern ulong my_default_record_cache_size; extern ulong my_default_record_cache_size;
extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks; NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
extern char wild_many,wild_one,wild_prefix; extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir; extern const char *charsets_dir;
/* from default.c */ /* from default.c */
extern char *my_defaults_extra_file; extern char *my_defaults_extra_file;
extern const char *my_defaults_group_suffix; extern const char *my_defaults_group_suffix;
skipping to change at line 666 skipping to change at line 680
#ifdef _WIN32 #ifdef _WIN32
extern int nt_share_delete(const char *name,myf MyFlags); extern int nt_share_delete(const char *name,myf MyFlags);
#define my_delete_allow_opened(fname,flags) nt_share_delete((fname),(flags )) #define my_delete_allow_opened(fname,flags) nt_share_delete((fname),(flags ))
#else #else
#define my_delete_allow_opened(fname,flags) my_delete((fname),(flags)) #define my_delete_allow_opened(fname,flags) my_delete((fname),(flags))
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
/* Windows-only functions (CRT equivalents)*/ /* Windows-only functions (CRT equivalents)*/
extern File my_sopen(const char *path, int oflag, int shflag, int pmode );
extern HANDLE my_get_osfhandle(File fd); extern HANDLE my_get_osfhandle(File fd);
extern void my_osmaperr(unsigned long last_error); extern void my_osmaperr(unsigned long last_error);
#endif #endif
#ifndef TERMINATE #ifndef TERMINATE
extern void TERMINATE(FILE *file, uint flag); extern void TERMINATE(FILE *file, uint flag);
#endif #endif
extern void init_glob_errs(void); extern void init_glob_errs(void);
extern const char** get_global_errmsgs(); extern const char** get_global_errmsgs();
extern void wait_for_free_space(const char *filename, int errors); extern void wait_for_free_space(const char *filename, int errors);
skipping to change at line 695 skipping to change at line 708
extern void my_error _VARARGS((int nr,myf MyFlags, ...)); extern void my_error _VARARGS((int nr,myf MyFlags, ...));
extern void my_printf_error _VARARGS((uint my_err, const char *format, extern void my_printf_error _VARARGS((uint my_err, const char *format,
myf MyFlags, ...)) myf MyFlags, ...))
ATTRIBUTE_FORMAT(printf, 2, 4); ATTRIBUTE_FORMAT(printf, 2, 4);
extern void my_printv_error(uint error, const char *format, myf MyFlags, extern void my_printv_error(uint error, const char *format, myf MyFlags,
va_list ap); va_list ap);
extern int my_error_register(const char** (*get_errmsgs) (), extern int my_error_register(const char** (*get_errmsgs) (),
int first, int last); int first, int last);
extern const char **my_error_unregister(int first, int last); extern const char **my_error_unregister(int first, int last);
extern void my_message(uint my_err, const char *str,myf MyFlags); extern void my_message(uint my_err, const char *str,myf MyFlags);
extern void my_message_no_curses(uint my_err, const char *str,myf MyFlags); extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);
extern void my_message_curses(uint my_err, const char *str,myf MyFlags);
extern my_bool my_basic_init(void); extern my_bool my_basic_init(void);
extern my_bool my_init(void); extern my_bool my_init(void);
extern void my_end(int infoflag); extern void my_end(int infoflag);
extern int my_redel(const char *from, const char *to, int MyFlags); extern int my_redel(const char *from, const char *to, int MyFlags);
extern int my_copystat(const char *from, const char *to, int MyFlags); extern int my_copystat(const char *from, const char *to, int MyFlags);
extern char * my_filename(File fd); extern char * my_filename(File fd);
#ifndef THREAD #ifndef THREAD
extern void dont_break(void); extern void dont_break(void);
extern void allow_break(void); extern void allow_break(void);
skipping to change at line 984 skipping to change at line 996
extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
uint cs_flags, myf my_flags); uint cs_flags, myf my_flags);
extern my_bool resolve_charset(const char *cs_name, extern my_bool resolve_charset(const char *cs_name,
CHARSET_INFO *default_cs, CHARSET_INFO *default_cs,
CHARSET_INFO **cs); CHARSET_INFO **cs);
extern my_bool resolve_collation(const char *cl_name, extern my_bool resolve_collation(const char *cl_name,
CHARSET_INFO *default_cl, CHARSET_INFO *default_cl,
CHARSET_INFO **cl); CHARSET_INFO **cl);
extern void free_charsets(void);
extern char *get_charsets_dir(char *buf); extern char *get_charsets_dir(char *buf);
extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
extern my_bool init_compiled_charsets(myf flags); extern my_bool init_compiled_charsets(myf flags);
extern void add_compiled_collation(CHARSET_INFO *cs); extern void add_compiled_collation(CHARSET_INFO *cs);
extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info, extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info,
char *to, size_t to_length, char *to, size_t to_length,
const char *from, size_t length); const char *from, size_t length);
#ifdef __WIN__ #ifdef __WIN__
#define BACKSLASH_MBTAIL #define BACKSLASH_MBTAIL
/* File system character set */ /* File system character set */
 End of changes. 9 change blocks. 
12 lines changed or deleted 23 lines changed or added


 mysql_com.h   mysql_com.h 
skipping to change at line 197 skipping to change at line 197
/* /*
Switch off the flags that are optional and depending on build flags Switch off the flags that are optional and depending on build flags
If any of the optional flags is supported by the build it will be switche d If any of the optional flags is supported by the build it will be switche d
on before sending to the client during the connection handshake. on before sending to the client during the connection handshake.
*/ */
#define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \ #define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
& ~CLIENT_COMPRESS) \ & ~CLIENT_COMPRESS) \
& ~CLIENT_SSL_VERIFY_SERVER_ CERT) & ~CLIENT_SSL_VERIFY_SERVER_ CERT)
#define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ /**
Is raised when a multi-statement transaction
has been started, either explicitly, by means
of BEGIN or COMMIT AND CHAIN, or
implicitly, by the first transactional
statement, when autocommit=off.
*/
#define SERVER_STATUS_IN_TRANS 1
#define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */ #define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */
#define SERVER_MORE_RESULTS_EXISTS 8 /* Multi query - next query exists */ #define SERVER_MORE_RESULTS_EXISTS 8 /* Multi query - next query exists */
#define SERVER_QUERY_NO_GOOD_INDEX_USED 16 #define SERVER_QUERY_NO_GOOD_INDEX_USED 16
#define SERVER_QUERY_NO_INDEX_USED 32 #define SERVER_QUERY_NO_INDEX_USED 32
/** /**
The server was able to fulfill the clients request and opened a The server was able to fulfill the clients request and opened a
read-only non-scrollable cursor for a query. This flag comes read-only non-scrollable cursor for a query. This flag comes
in reply to COM_STMT_EXECUTE and COM_STMT_FETCH commands. in reply to COM_STMT_EXECUTE and COM_STMT_FETCH commands.
*/ */
#define SERVER_STATUS_CURSOR_EXISTS 64 #define SERVER_STATUS_CURSOR_EXISTS 64
skipping to change at line 299 skipping to change at line 306
unsigned char *unused; unsigned char *unused;
unsigned int last_errno; unsigned int last_errno;
unsigned char error; unsigned char error;
my_bool unused4; /* Please remove with the next incompatible ABI change. */ my_bool unused4; /* Please remove with the next incompatible ABI change. */
my_bool unused5; /* Please remove with the next incompatible ABI change. */ my_bool unused5; /* Please remove with the next incompatible ABI change. */
/** Client library error message buffer. Actually belongs to struct MYSQL . */ /** Client library error message buffer. Actually belongs to struct MYSQL . */
char last_error[MYSQL_ERRMSG_SIZE]; char last_error[MYSQL_ERRMSG_SIZE];
/** Client library sqlstate buffer. Set along with the error message. */ /** Client library sqlstate buffer. Set along with the error message. */
char sqlstate[SQLSTATE_LENGTH+1]; char sqlstate[SQLSTATE_LENGTH+1];
void *extension; void *extension;
#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
/*
Controls whether a big packet should be skipped.
Initially set to FALSE by default. Unauthenticated sessions must have
this set to FALSE so that the server can't be tricked to read packets
indefinitely.
*/
my_bool skip_big_packet;
#endif
} NET; } NET;
#define packet_error (~(unsigned long) 0) #define packet_error (~(unsigned long) 0)
enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
MYSQL_TYPE_SHORT, MYSQL_TYPE_LONG, MYSQL_TYPE_SHORT, MYSQL_TYPE_LONG,
MYSQL_TYPE_FLOAT, MYSQL_TYPE_DOUBLE, MYSQL_TYPE_FLOAT, MYSQL_TYPE_DOUBLE,
MYSQL_TYPE_NULL, MYSQL_TYPE_TIMESTAMP, MYSQL_TYPE_NULL, MYSQL_TYPE_TIMESTAMP,
MYSQL_TYPE_LONGLONG,MYSQL_TYPE_INT24, MYSQL_TYPE_LONGLONG,MYSQL_TYPE_INT24,
MYSQL_TYPE_DATE, MYSQL_TYPE_TIME, MYSQL_TYPE_DATE, MYSQL_TYPE_TIME,
 End of changes. 2 change blocks. 
1 lines changed or deleted 18 lines changed or added


 mysql_embed.h   mysql_embed.h 
skipping to change at line 27 skipping to change at line 27
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
/* Defines that are unique to the embedded version of MySQL */ /* Defines that are unique to the embedded version of MySQL */
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
/* Things we don't need in the embedded version of MySQL */ /* Things we don't need in the embedded version of MySQL */
/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */ /* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
#undef HAVE_PSTACK /* No stacktrace */ #undef HAVE_PSTACK /* No stacktrace */
#undef HAVE_OPENSSL #undef HAVE_DLOPEN /* No udf functions */
#undef HAVE_SMEM /* No shared memory */ #undef HAVE_SMEM /* No shared memory */
#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */ #undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
#define DONT_USE_RAID #define DONT_USE_RAID
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
#endif /* MYSQL_EMBED_INCLUDED */ #endif /* MYSQL_EMBED_INCLUDED */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql_file.h   mysql_file.h 
skipping to change at line 23 skipping to change at line 23
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef MYSQL_FILE_H #ifndef MYSQL_FILE_H
#define MYSQL_FILE_H #define MYSQL_FILE_H
/* For strlen() */ /* For strlen() */
#include <string.h> #include <string.h>
/* For MY_STAT */ /* For MY_STAT */
#include <my_dir.h> #include <my_dir.h>
/* For my_chsize */
#include <my_sys.h>
/** /**
@file mysql/psi/mysql_file.h @file mysql/psi/mysql_file.h
Instrumentation helpers for mysys file io. Instrumentation helpers for mysys file io.
This header file provides the necessary declarations This header file provides the necessary declarations
to use the mysys file API with the performance schema instrumentation. to use the mysys file API with the performance schema instrumentation.
In some compilers (SunStudio), 'static inline' functions, when declared In some compilers (SunStudio), 'static inline' functions, when declared
but not used, are not optimized away (because they are unused) by default , but not used, are not optimized away (because they are unused) by default ,
so that including a static inline function from a header file does so that including a static inline function from a header file does
create unwanted dependencies, causing unresolved symbols at link time. create unwanted dependencies, causing unresolved symbols at link time.
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mysql_version.h   mysql_version.h 
skipping to change at line 12 skipping to change at line 12
This file is public domain and comes with NO WARRANTY of any kind */ This file is public domain and comes with NO WARRANTY of any kind */
/* Version numbers for protocol & mysqld */ /* Version numbers for protocol & mysqld */
#ifndef _mysql_version_h #ifndef _mysql_version_h
#define _mysql_version_h #define _mysql_version_h
#ifdef _CUSTOMCONFIG_ #ifdef _CUSTOMCONFIG_
#include <custom_conf.h> #include <custom_conf.h>
#else #else
#define PROTOCOL_VERSION 10 #define PROTOCOL_VERSION 10
#define MYSQL_SERVER_VERSION "5.5.4-m3" #define MYSQL_SERVER_VERSION "5.5.5-m3"
#define MYSQL_BASE_VERSION "mysqld-5.5" #define MYSQL_BASE_VERSION "mysqld-5.5"
#define MYSQL_SERVER_SUFFIX_DEF "" #define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6 #define FRM_VER 6
#define MYSQL_VERSION_ID 50504 #define MYSQL_VERSION_ID 50505
#define MYSQL_PORT 3306 #define MYSQL_PORT 3306
#define MYSQL_PORT_DEFAULT 0 #define MYSQL_PORT_DEFAULT 0
#define MYSQL_UNIX_ADDR "/tmp/mysql.sock" #define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
#define MYSQL_CONFIG_NAME "my" #define MYSQL_CONFIG_NAME "my"
#define MYSQL_COMPILATION_COMMENT "Source distribution" #define MYSQL_COMPILATION_COMMENT "Source distribution"
/* mysqld compile time options */ /* mysqld compile time options */
#endif /* _CUSTOMCONFIG_ */ #endif /* _CUSTOMCONFIG_ */
#ifndef LICENSE #ifndef LICENSE
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mysqld_ername.h   mysqld_ername.h 
skipping to change at line 595 skipping to change at line 595
{ "ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT", 1582, "Incorrect parameter count in the call to native function \'%-.192s\'" }, { "ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT", 1582, "Incorrect parameter count in the call to native function \'%-.192s\'" },
{ "ER_WRONG_PARAMETERS_TO_NATIVE_FCT", 1583, "Incorrect parameters in the c all to native function \'%-.192s\'" }, { "ER_WRONG_PARAMETERS_TO_NATIVE_FCT", 1583, "Incorrect parameters in the c all to native function \'%-.192s\'" },
{ "ER_WRONG_PARAMETERS_TO_STORED_FCT", 1584, "Incorrect parameters in the c all to stored function \'%-.192s\'" }, { "ER_WRONG_PARAMETERS_TO_STORED_FCT", 1584, "Incorrect parameters in the c all to stored function \'%-.192s\'" },
{ "ER_NATIVE_FCT_NAME_COLLISION", 1585, "This function \'%-.192s\' has the same name as a native function" }, { "ER_NATIVE_FCT_NAME_COLLISION", 1585, "This function \'%-.192s\' has the same name as a native function" },
{ "ER_DUP_ENTRY_WITH_KEY_NAME", 1586, "Duplicate entry \'%-.64s\' for key \ '%-.192s\'" }, { "ER_DUP_ENTRY_WITH_KEY_NAME", 1586, "Duplicate entry \'%-.64s\' for key \ '%-.192s\'" },
{ "ER_BINLOG_PURGE_EMFILE", 1587, "Too many files opened, please execute th e command again" }, { "ER_BINLOG_PURGE_EMFILE", 1587, "Too many files opened, please execute th e command again" },
{ "ER_EVENT_CANNOT_CREATE_IN_THE_PAST", 1588, "Event execution time is in t he past and ON COMPLETION NOT PRESERVE is set. The event was dropped immedi ately after creation." }, { "ER_EVENT_CANNOT_CREATE_IN_THE_PAST", 1588, "Event execution time is in t he past and ON COMPLETION NOT PRESERVE is set. The event was dropped immedi ately after creation." },
{ "ER_EVENT_CANNOT_ALTER_IN_THE_PAST", 1589, "Event execution time is in th e past and ON COMPLETION NOT PRESERVE is set. The event was dropped immedia tely after creation." }, { "ER_EVENT_CANNOT_ALTER_IN_THE_PAST", 1589, "Event execution time is in th e past and ON COMPLETION NOT PRESERVE is set. The event was dropped immedia tely after creation." },
{ "ER_SLAVE_INCIDENT", 1590, "The incident %s occured on the master. Messag e: %-.64s" }, { "ER_SLAVE_INCIDENT", 1590, "The incident %s occured on the master. Messag e: %-.64s" },
{ "ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT", 1591, "Table has no partition f or some existing values" }, { "ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT", 1591, "Table has no partition f or some existing values" },
{ "ER_BINLOG_UNSAFE_STATEMENT", 1592, "Unsafe statement binlogged in statem ent format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: %s" }, { "ER_BINLOG_UNSAFE_STATEMENT", 1592, "Unsafe statement written to the bina ry log using statement format since BINLOG_FORMAT = STATEMENT. %s" },
{ "ER_SLAVE_FATAL_ERROR", 1593, "Fatal error: %s" }, { "ER_SLAVE_FATAL_ERROR", 1593, "Fatal error: %s" },
{ "ER_SLAVE_RELAY_LOG_READ_FAILURE", 1594, "Relay log read failure: %s" }, { "ER_SLAVE_RELAY_LOG_READ_FAILURE", 1594, "Relay log read failure: %s" },
{ "ER_SLAVE_RELAY_LOG_WRITE_FAILURE", 1595, "Relay log write failure: %s" } , { "ER_SLAVE_RELAY_LOG_WRITE_FAILURE", 1595, "Relay log write failure: %s" } ,
{ "ER_SLAVE_CREATE_EVENT_FAILURE", 1596, "Failed to create %s" }, { "ER_SLAVE_CREATE_EVENT_FAILURE", 1596, "Failed to create %s" },
{ "ER_SLAVE_MASTER_COM_FAILURE", 1597, "Master command %s failed: %s" }, { "ER_SLAVE_MASTER_COM_FAILURE", 1597, "Master command %s failed: %s" },
{ "ER_BINLOG_LOGGING_IMPOSSIBLE", 1598, "Binary logging not possible. Messa ge: %s" }, { "ER_BINLOG_LOGGING_IMPOSSIBLE", 1598, "Binary logging not possible. Messa ge: %s" },
{ "ER_VIEW_NO_CREATION_CTX", 1599, "View `%-.64s`.`%-.64s` has no creation context" }, { "ER_VIEW_NO_CREATION_CTX", 1599, "View `%-.64s`.`%-.64s` has no creation context" },
{ "ER_VIEW_INVALID_CREATION_CTX", 1600, "Creation context of view `%-.64s`. `%-.64s\' is invalid" }, { "ER_VIEW_INVALID_CREATION_CTX", 1600, "Creation context of view `%-.64s`. `%-.64s\' is invalid" },
{ "ER_SR_INVALID_CREATION_CTX", 1601, "Creation context of stored routine ` %-.64s`.`%-.64s` is invalid" }, { "ER_SR_INVALID_CREATION_CTX", 1601, "Creation context of stored routine ` %-.64s`.`%-.64s` is invalid" },
{ "ER_TRG_CORRUPTED_FILE", 1602, "Corrupted TRG file for table `%-.64s`.`%- .64s`" }, { "ER_TRG_CORRUPTED_FILE", 1602, "Corrupted TRG file for table `%-.64s`.`%- .64s`" },
skipping to change at line 664 skipping to change at line 664
{ "ER_QUERY_CACHE_DISABLED", 1651, "Query cache is disabled; restart the se rver with query_cache_type=1 to enable it" }, { "ER_QUERY_CACHE_DISABLED", 1651, "Query cache is disabled; restart the se rver with query_cache_type=1 to enable it" },
{ "ER_SAME_NAME_PARTITION_FIELD", 1652, "Duplicate partition field name \'% -.192s\'" }, { "ER_SAME_NAME_PARTITION_FIELD", 1652, "Duplicate partition field name \'% -.192s\'" },
{ "ER_PARTITION_COLUMN_LIST_ERROR", 1653, "Inconsistency in usage of column lists for partitioning" }, { "ER_PARTITION_COLUMN_LIST_ERROR", 1653, "Inconsistency in usage of column lists for partitioning" },
{ "ER_WRONG_TYPE_COLUMN_VALUE_ERROR", 1654, "Partition column values of inc orrect type" }, { "ER_WRONG_TYPE_COLUMN_VALUE_ERROR", 1654, "Partition column values of inc orrect type" },
{ "ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR", 1655, "Too many fields in \'%- .192s\'" }, { "ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR", 1655, "Too many fields in \'%- .192s\'" },
{ "ER_MAXVALUE_IN_VALUES_IN", 1656, "Cannot use MAXVALUE as value in VALUES IN" }, { "ER_MAXVALUE_IN_VALUES_IN", 1656, "Cannot use MAXVALUE as value in VALUES IN" },
{ "ER_TOO_MANY_VALUES_ERROR", 1657, "Cannot have more than one value for th is type of %-.64s partitioning" }, { "ER_TOO_MANY_VALUES_ERROR", 1657, "Cannot have more than one value for th is type of %-.64s partitioning" },
{ "ER_ROW_SINGLE_PARTITION_FIELD_ERROR", 1658, "Row expressions in VALUES I N only allowed for multi-field column partitioning" }, { "ER_ROW_SINGLE_PARTITION_FIELD_ERROR", 1658, "Row expressions in VALUES I N only allowed for multi-field column partitioning" },
{ "ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD", 1659, "Field \'%-.192s\' is of a not allowed type for this type of partitioning" }, { "ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD", 1659, "Field \'%-.192s\' is of a not allowed type for this type of partitioning" },
{ "ER_PARTITION_FIELDS_TOO_LONG", 1660, "The total length of the partitioni ng fields is too large" }, { "ER_PARTITION_FIELDS_TOO_LONG", 1660, "The total length of the partitioni ng fields is too large" },
{ "ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE", 1661, "Cannot execute statement: { "ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE", 1661, "Cannot execute statement:
binlogging impossible since both row-incapable engines and statement-incapa impossible to write to binary log since both row-incapable engines and stat
ble engines are involved." }, ement-incapable engines are involved." },
{ "ER_BINLOG_ROW_MODE_AND_STMT_ENGINE", 1662, "Cannot execute statement: bi { "ER_BINLOG_ROW_MODE_AND_STMT_ENGINE", 1662, "Cannot execute statement: im
nlogging impossible since BINLOG_FORMAT = ROW and at least one table uses a possible to write to binary log since BINLOG_FORMAT = ROW and at least one
storage engine limited to statement-logging." }, table uses a storage engine limited to statement-based logging." },
{ "ER_BINLOG_UNSAFE_AND_STMT_ENGINE", 1663, "Cannot execute statement: binl { "ER_BINLOG_UNSAFE_AND_STMT_ENGINE", 1663, "Cannot execute statement: impo
ogging of unsafe statement is impossible when storage engine is limited to ssible to write to binary log since statement is unsafe, storage engine is
statement-logging and BINLOG_FORMAT = MIXED. Reason for unsafeness: %s" }, limited to statement-based logging, and BINLOG_FORMAT = MIXED. %s" },
{ "ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE", 1664, "Cannot execute row inje { "ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE", 1664, "Cannot execute statemen
ction: binlogging impossible since at least one table uses a storage engine t: impossible to write to binary log since statement is in row format and a
limited to statement-logging." }, t least one table uses a storage engine limited to statement-based logging.
{ "ER_BINLOG_STMT_MODE_AND_ROW_ENGINE", 1665, "Cannot execute statement: bi " },
nlogging impossible since BINLOG_FORMAT = STATEMENT and at least one table { "ER_BINLOG_STMT_MODE_AND_ROW_ENGINE", 1665, "Cannot execute statement: im
uses a storage engine limited to row-logging.%s" }, possible to write to binary log since BINLOG_FORMAT = STATEMENT and at leas
{ "ER_BINLOG_ROW_INJECTION_AND_STMT_MODE", 1666, "Cannot execute row inject t one table uses a storage engine limited to row-based logging.%s" },
ion: binlogging impossible since BINLOG_FORMAT = STATEMENT." }, { "ER_BINLOG_ROW_INJECTION_AND_STMT_MODE", 1666, "Cannot execute statement:
{ "ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE", 1667, "Cannot execu impossible to write to binary log since statement is in row format and BIN
te statement: binlogging impossible since more than one engine is involved LOG_FORMAT = STATEMENT." },
and at least one engine is self-logging." }, { "ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE", 1667, "Cannot execu
{ "ER_BINLOG_UNSAFE_LIMIT", 1668, "Statement uses a LIMIT clause. This is u te statement: impossible to write to binary log since more than one engine
nsafe because the set of rows included cannot be predicted." }, is involved and at least one engine is self-logging." },
{ "ER_BINLOG_UNSAFE_INSERT_DELAYED", 1669, "Statement uses INSERT DELAYED. { "ER_BINLOG_UNSAFE_LIMIT", 1668, "The statement is unsafe because it uses
This is unsafe because the time when rows are inserted cannot be predicted. a LIMIT clause. This is unsafe because the set of rows included cannot be p
" }, redicted." },
{ "ER_BINLOG_UNSAFE_SYSTEM_TABLE", 1670, "Statement uses the general_log, s { "ER_BINLOG_UNSAFE_INSERT_DELAYED", 1669, "The statement is unsafe because
low_log or performance_schema table(s). This is unsafe because system table it uses INSERT DELAYED. This is unsafe because the times when rows are ins
s may differ on slave." }, erted cannot be predicted." },
{ "ER_BINLOG_UNSAFE_AUTOINC_COLUMNS", 1671, "Statement invokes a trigger or { "ER_BINLOG_UNSAFE_SYSTEM_TABLE", 1670, "The statement is unsafe because i
a stored function that inserts into AUTO_INCREMENT column which is unsafe t uses the general log, slow query log, or performance_schema table(s). Thi
to binlog in STATEMENT format because slave may execute it non-deterministi s is unsafe because system tables may differ on slaves." },
cally." }, { "ER_BINLOG_UNSAFE_AUTOINC_COLUMNS", 1671, "Statement is unsafe because it
{ "ER_BINLOG_UNSAFE_UDF", 1672, "Statement uses a UDF. It cannot be determi invokes a trigger or a stored function that inserts into an AUTO_INCREMENT
ned if the UDF will return the same value on slave." }, column. Inserted values cannot be logged correctly." },
{ "ER_BINLOG_UNSAFE_SYSTEM_VARIABLE", 1673, "Statement uses a system variab { "ER_BINLOG_UNSAFE_UDF", 1672, "Statement is unsafe because it uses a UDF
le whose value may differ on slave." }, which may not return the same value on the slave." },
{ "ER_BINLOG_UNSAFE_SYSTEM_FUNCTION", 1674, "Statement uses a system functi { "ER_BINLOG_UNSAFE_SYSTEM_VARIABLE", 1673, "Statement is unsafe because it
on whose value may differ on slave." }, uses a system variable that may have a different value on the slave." },
{ "ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS", 1675, "Non-transactional reads o { "ER_BINLOG_UNSAFE_SYSTEM_FUNCTION", 1674, "Statement is unsafe because it
r writes are unsafe if they occur after transactional reads or writes insid uses a system function that may return a different value on the slave." },
e a transaction." }, { "ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS", 1675, "Statement is unsafe becau
se it accesses a non-transactional table after accessing a transactional ta
ble within the same transaction." },
{ "ER_MESSAGE_AND_STATEMENT", 1676, "%s Statement: %s" }, { "ER_MESSAGE_AND_STATEMENT", 1676, "%s Statement: %s" },
{ "ER_SLAVE_CONVERSION_FAILED", 1677, "Column %d of table \'%-.192s.%-.192s \' cannot be converted from type \'%-.32s\' to type \'%-.32s\'" }, { "ER_SLAVE_CONVERSION_FAILED", 1677, "Column %d of table \'%-.192s.%-.192s \' cannot be converted from type \'%-.32s\' to type \'%-.32s\'" },
{ "ER_SLAVE_CANT_CREATE_CONVERSION", 1678, "Can\'t create conversion table for table \'%-.192s.%-.192s\'" }, { "ER_SLAVE_CANT_CREATE_CONVERSION", 1678, "Can\'t create conversion table for table \'%-.192s.%-.192s\'" },
{ "ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT", 1679, "Cannot modi fy @@session.binlog_format inside a transaction" }, { "ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT", 1679, "Cannot modi fy @@session.binlog_format inside a transaction" },
{ "ER_PATH_LENGTH", 1680, "The path specified for %.64s is too long." }, { "ER_PATH_LENGTH", 1680, "The path specified for %.64s is too long." },
{ "ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT", 1681, "The syntax \'%s\' is d eprecated and will be removed in MySQL %s." }, { "ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT", 1681, "The syntax \'%s\' is d eprecated and will be removed in MySQL %s." },
{ "ER_WRONG_NATIVE_TABLE_STRUCTURE", 1682, "Native table \'%-.64s\'.\'%-.64 s\' has the wrong structure" }, { "ER_WRONG_NATIVE_TABLE_STRUCTURE", 1682, "Native table \'%-.64s\'.\'%-.64 s\' has the wrong structure" },
{ "ER_WRONG_PERFSCHEMA_USAGE", 1683, "Invalid performance_schema usage." }, { "ER_WRONG_PERFSCHEMA_USAGE", 1683, "Invalid performance_schema usage." },
{ "ER_WARN_I_S_SKIPPED_TABLE", 1684, "Table \'%s\'.\'%s\' was skipped since its definition is being modified by concurrent DDL statement" }, { "ER_WARN_I_S_SKIPPED_TABLE", 1684, "Table \'%s\'.\'%s\' was skipped since its definition is being modified by concurrent DDL statement" },
{ "ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT", 1685, "Cannot modi fy @@session.binlog_direct_non_transactional_updates inside a transaction" }, { "ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT", 1685, "Cannot modi fy @@session.binlog_direct_non_transactional_updates inside a transaction" },
{ "ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT", 1686, "Cannot change the binlog direct flag inside a stored function or trigger" }, { "ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT", 1686, "Cannot change the binlog direct flag inside a stored function or trigger" },
{ "ER_SPATIAL_MUST_HAVE_GEOM_COL", 1687, "A SPATIAL index may only contain a geometrical type column" }, { "ER_SPATIAL_MUST_HAVE_GEOM_COL", 1687, "A SPATIAL index may only contain a geometrical type column" },
{ "ER_TOO_LONG_INDEX_COMMENT", 1688, "Comment for index \'%-.64s\' is too l ong (max = %lu)" }, { "ER_TOO_LONG_INDEX_COMMENT", 1688, "Comment for index \'%-.64s\' is too l ong (max = %lu)" },
{ "ER_LOCK_ABORTED", 1689, "Wait on a lock was aborted due to a pending exc lusive lock" }, { "ER_LOCK_ABORTED", 1689, "Wait on a lock was aborted due to a pending exc lusive lock" },
{ "ER_DATA_OUT_OF_RANGE", 1690, "%s value is out of range in \'%s\'" },
{ "ER_WRONG_SPVAR_TYPE_IN_LIMIT", 1691, "A variable of a non-integer type i
n LIMIT clause" },
{ "ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE", 1692, "Mixin
g self-logging and non-self-logging engines in a statement is unsafe." },
{ "ER_BINLOG_UNSAFE_MIXED_STATEMENT", 1693, "Statement accesses nontransact
ional table as well as transactional or temporary table, and writes to any
of them." },
{ "ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_SQL_LOG_BIN", 1694, "Cannot modify
@@session.sql_log_bin inside a transaction" },
{ "ER_STORED_FUNCTION_PREVENTS_SWITCH_SQL_LOG_BIN", 1695, "Cannot change th
e sql_log_bin inside a stored function or trigger" },
{ "ER_FAILED_READ_FROM_PAR_FILE", 1696, "Failed to read from the .par file"
},
 End of changes. 3 change blocks. 
42 lines changed or deleted 44 lines changed or added


 mysqld_error.h   mysqld_error.h 
skipping to change at line 694 skipping to change at line 694
#define ER_PATH_LENGTH 1680 #define ER_PATH_LENGTH 1680
#define ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT 1681 #define ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT 1681
#define ER_WRONG_NATIVE_TABLE_STRUCTURE 1682 #define ER_WRONG_NATIVE_TABLE_STRUCTURE 1682
#define ER_WRONG_PERFSCHEMA_USAGE 1683 #define ER_WRONG_PERFSCHEMA_USAGE 1683
#define ER_WARN_I_S_SKIPPED_TABLE 1684 #define ER_WARN_I_S_SKIPPED_TABLE 1684
#define ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT 1685 #define ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT 1685
#define ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT 1686 #define ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT 1686
#define ER_SPATIAL_MUST_HAVE_GEOM_COL 1687 #define ER_SPATIAL_MUST_HAVE_GEOM_COL 1687
#define ER_TOO_LONG_INDEX_COMMENT 1688 #define ER_TOO_LONG_INDEX_COMMENT 1688
#define ER_LOCK_ABORTED 1689 #define ER_LOCK_ABORTED 1689
#define ER_ERROR_LAST 1689 #define ER_DATA_OUT_OF_RANGE 1690
#define ER_WRONG_SPVAR_TYPE_IN_LIMIT 1691
#define ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE 1692
#define ER_BINLOG_UNSAFE_MIXED_STATEMENT 1693
#define ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_SQL_LOG_BIN 1694
#define ER_STORED_FUNCTION_PREVENTS_SWITCH_SQL_LOG_BIN 1695
#define ER_FAILED_READ_FROM_PAR_FILE 1696
#define ER_ERROR_LAST 1696
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 plugin.h   plugin.h 
skipping to change at line 400 skipping to change at line 400
/* /*
Plugin description structure. Plugin description structure.
*/ */
struct st_mysql_plugin struct st_mysql_plugin
{ {
int type; /* the plugin type (a MYSQL_XXX_PLUGIN value) */ int type; /* the plugin type (a MYSQL_XXX_PLUGIN value) */
void *info; /* pointer to type-specific plugin descriptor */ void *info; /* pointer to type-specific plugin descriptor */
const char *name; /* plugin name */ const char *name; /* plugin name */
const char *author; /* plugin author (for SHOW PLUGINS) */ const char *author; /* plugin author (for I_S.PLUGINS) */
const char *descr; /* general descriptive text (for SHOW PLUGINS ) */ const char *descr; /* general descriptive text (for I_S.PLUGINS) */
int license; /* the plugin license (PLUGIN_LICENSE_XXX) */ int license; /* the plugin license (PLUGIN_LICENSE_XXX) */
int (*init)(void *); /* the function to invoke when plugin is loaded */ int (*init)(void *); /* the function to invoke when plugin is loaded */
int (*deinit)(void *);/* the function to invoke when plugin is unloaded * / int (*deinit)(void *);/* the function to invoke when plugin is unloaded * /
unsigned int version; /* plugin version (for SHOW PLUGINS) */ unsigned int version; /* plugin version (for I_S.PLUGINS) */
struct st_mysql_show_var *status_vars; struct st_mysql_show_var *status_vars;
struct st_mysql_sys_var **system_vars; struct st_mysql_sys_var **system_vars;
void * __reserved1; /* reserved for dependency checking */ void * __reserved1; /* reserved for dependency checking */
}; };
/************************************************************************* /*************************************************************************
API for Full-text parser plugin. (MYSQL_FTPARSER_PLUGIN) API for Full-text parser plugin. (MYSQL_FTPARSER_PLUGIN)
*/ */
#include "plugin_ftparser.h" #include "plugin_ftparser.h"
skipping to change at line 583 skipping to change at line 583
@param thd user thread connection handle @param thd user thread connection handle
@param key databasename\\0tablename\\0 @param key databasename\\0tablename\\0
@param key_length length of key in bytes, including the NUL bytes @param key_length length of key in bytes, including the NUL bytes
@param using_trx flag: TRUE if using transactions, FALSE otherwise @param using_trx flag: TRUE if using transactions, FALSE otherwise
*/ */
void mysql_query_cache_invalidate4(MYSQL_THD thd, void mysql_query_cache_invalidate4(MYSQL_THD thd,
const char *key, unsigned int key_length , const char *key, unsigned int key_length ,
int using_trx); int using_trx);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
/** /**
Provide a handler data getter to simplify coding Provide a handler data getter to simplify coding
*/ */
inline void *thd_get_ha_data(const MYSQL_THD thd, const struct handlerton *hton);
void *
thd_get_ha_data(const MYSQL_THD thd, const struct handlerton *hton)
{
return *thd_ha_data(thd, hton);
}
/** /**
Provide a handler data setter to simplify coding Provide a handler data setter to simplify coding
@details
Set ha_data pointer (storage engine per-connection information).
To avoid unclean deactivation (uninstall) of storage engine plugin
in the middle of transaction, additional storage engine plugin
lock is acquired.
If ha_data is not null and storage engine plugin was not locked
by thd_set_ha_data() in this connection before, storage engine
plugin gets locked.
If ha_data is null and storage engine plugin was locked by
thd_set_ha_data() in this connection before, storage engine
plugin lock gets released.
If handlerton::close_connection() didn't reset ha_data, server does
it immediately after calling handlerton::close_connection().
*/ */
inline void thd_set_ha_data(MYSQL_THD thd, const struct handlerton *hton,
void const void *ha_data);
thd_set_ha_data(const MYSQL_THD thd, const struct handlerton *hton, #ifdef __cplusplus
const void *ha_data)
{
*thd_ha_data(thd, hton)= (void*) ha_data;
} }
#endif #endif
#endif #endif
 End of changes. 6 change blocks. 
20 lines changed or deleted 25 lines changed or added


 plugin_audit.h   plugin_audit.h 
skipping to change at line 27 skipping to change at line 27
#define _my_audit_h #define _my_audit_h
/************************************************************************* /*************************************************************************
API for Audit plugin. (MYSQL_AUDIT_PLUGIN) API for Audit plugin. (MYSQL_AUDIT_PLUGIN)
*/ */
#include "plugin.h" #include "plugin.h"
#define MYSQL_AUDIT_CLASS_MASK_SIZE 1 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
#define MYSQL_AUDIT_INTERFACE_VERSION 0x0100 #define MYSQL_AUDIT_INTERFACE_VERSION 0x0200
/* /*
The first word in every event class struct indicates the specific The first word in every event class struct indicates the specific
class of the event. class of the event.
*/ */
struct mysql_event struct mysql_event
{ {
int event_class; unsigned int event_class;
}; };
/************************************************************************* /*************************************************************************
AUDIT CLASS : GENERAL AUDIT CLASS : GENERAL
LOG events occurs before emitting to the general query log. LOG events occurs before emitting to the general query log.
ERROR events occur before transmitting errors to the user. ERROR events occur before transmitting errors to the user.
RESULT events occur after transmitting a resultset to the user. RESULT events occur after transmitting a resultset to the user.
*/ */
#define MYSQL_AUDIT_GENERAL_CLASS 0 #define MYSQL_AUDIT_GENERAL_CLASS 0
#define MYSQL_AUDIT_GENERAL_CLASSMASK (1 << MYSQL_AUDIT_GENERAL_CLASS) #define MYSQL_AUDIT_GENERAL_CLASSMASK (1 << MYSQL_AUDIT_GENERAL_CLASS)
#define MYSQL_AUDIT_GENERAL_LOG 0 #define MYSQL_AUDIT_GENERAL_LOG 0
#define MYSQL_AUDIT_GENERAL_ERROR 1 #define MYSQL_AUDIT_GENERAL_ERROR 1
#define MYSQL_AUDIT_GENERAL_RESULT 2 #define MYSQL_AUDIT_GENERAL_RESULT 2
struct mysql_event_general struct mysql_event_general
{ {
int event_class; unsigned int event_class;
unsigned int event_subclass;
int general_error_code; int general_error_code;
unsigned long general_thread_id; unsigned long general_thread_id;
const char *general_user; const char *general_user;
unsigned int general_user_length; unsigned int general_user_length;
const char *general_command; const char *general_command;
unsigned int general_command_length; unsigned int general_command_length;
const char *general_query; const char *general_query;
unsigned int general_query_length; unsigned int general_query_length;
struct charset_info_st *general_charset; struct charset_info_st *general_charset;
unsigned long long general_time; unsigned long long general_time;
 End of changes. 3 change blocks. 
3 lines changed or deleted 4 lines changed or added


 sql_state.h   sql_state.h 
skipping to change at line 218 skipping to change at line 218
{ ER_DUP_ENTRY_WITH_KEY_NAME ,"23000", "S1009" }, { ER_DUP_ENTRY_WITH_KEY_NAME ,"23000", "S1009" },
{ ER_XA_RBTIMEOUT ,"XA106", "" }, { ER_XA_RBTIMEOUT ,"XA106", "" },
{ ER_XA_RBDEADLOCK ,"XA102", "" }, { ER_XA_RBDEADLOCK ,"XA102", "" },
{ ER_FUNC_INEXISTENT_NAME_COLLISION ,"42000", "" }, { ER_FUNC_INEXISTENT_NAME_COLLISION ,"42000", "" },
{ ER_DUP_SIGNAL_SET ,"42000", "" }, { ER_DUP_SIGNAL_SET ,"42000", "" },
{ ER_SIGNAL_WARN ,"01000", "" }, { ER_SIGNAL_WARN ,"01000", "" },
{ ER_SIGNAL_NOT_FOUND ,"02000", "" }, { ER_SIGNAL_NOT_FOUND ,"02000", "" },
{ ER_SIGNAL_EXCEPTION ,"HY000", "" }, { ER_SIGNAL_EXCEPTION ,"HY000", "" },
{ ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER ,"0K000", "" }, { ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER ,"0K000", "" },
{ ER_SPATIAL_MUST_HAVE_GEOM_COL ,"42000", "" }, { ER_SPATIAL_MUST_HAVE_GEOM_COL ,"42000", "" },
{ ER_DATA_OUT_OF_RANGE ,"22003", "" },
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 sslopt-case.h   sslopt-case.h 
skipping to change at line 19 skipping to change at line 19
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifdef HAVE_OPENSSL #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
case OPT_SSL_KEY: case OPT_SSL_KEY:
case OPT_SSL_CERT: case OPT_SSL_CERT:
case OPT_SSL_CA: case OPT_SSL_CA:
case OPT_SSL_CAPATH: case OPT_SSL_CAPATH:
case OPT_SSL_CIPHER: case OPT_SSL_CIPHER:
/* /*
Enable use of SSL if we are using any ssl option Enable use of SSL if we are using any ssl option
One can disable SSL later by using --skip-ssl or --ssl=0 One can disable SSL later by using --skip-ssl or --ssl=0
*/ */
opt_use_ssl= 1; opt_use_ssl= 1;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 sslopt-longopts.h   sslopt-longopts.h 
skipping to change at line 19 skipping to change at line 19
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifdef HAVE_OPENSSL #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
{"ssl", OPT_SSL_SSL, {"ssl", OPT_SSL_SSL,
"Enable SSL for connection (automatically enabled with other flags).", "Enable SSL for connection (automatically enabled with other flags).",
(uchar **) &opt_use_ssl, (uchar **) &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, &opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
0, 0,
0, 0, 0},
{"ssl-ca", OPT_SSL_CA, {"ssl-ca", OPT_SSL_CA,
"CA file in PEM format (check OpenSSL docs, implies --ssl).", "CA file in PEM format (check OpenSSL docs, implies --ssl).",
(uchar **) &opt_ssl_ca, (uchar **) &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG , &opt_ssl_ca, &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"ssl-capath", OPT_SSL_CAPATH, {"ssl-capath", OPT_SSL_CAPATH,
"CA directory (check OpenSSL docs, implies --ssl).", "CA directory (check OpenSSL docs, implies --ssl).",
(uchar **) &opt_ssl_capath, (uchar **) &opt_ssl_capath, 0, GET_STR, REQU IRED_ARG, &opt_ssl_capath, &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).", {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).",
(uchar **) &opt_ssl_cert, (uchar **) &opt_ssl_cert, 0, GET_STR, REQUIRED _ARG, &opt_ssl_cert, &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl).", {"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl).",
(uchar **) &opt_ssl_cipher, (uchar **) &opt_ssl_cipher, 0, GET_STR, REQU IRED_ARG, &opt_ssl_cipher, &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).", {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).",
(uchar **) &opt_ssl_key, (uchar **) &opt_ssl_key, 0, GET_STR, REQUIRED_A RG, &opt_ssl_key, &opt_ssl_key, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
#ifdef MYSQL_CLIENT #ifdef MYSQL_CLIENT
{"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT, {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,
"Verify server's \"Common Name\" in its cert against hostname used when "Verify server's \"Common Name\" in its cert against hostname used "
connecting. This option is disabled by default.", "when connecting. This option is disabled by default.",
(uchar **) &opt_ssl_verify_server_cert, (uchar **) &opt_ssl_verify_serve &opt_ssl_verify_server_cert, &opt_ssl_verify_server_cert,
r_cert, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
#endif /* SSLOPT_LONGOPTS_INCLUDED */ #endif /* SSLOPT_LONGOPTS_INCLUDED */
 End of changes. 8 change blocks. 
14 lines changed or deleted 11 lines changed or added


 sslopt-vars.h   sslopt-vars.h 
skipping to change at line 19 skipping to change at line 19
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A */
#ifdef HAVE_OPENSSL #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
#ifdef SSL_VARS_NOT_STATIC #ifdef SSL_VARS_NOT_STATIC
#define SSL_STATIC #define SSL_STATIC
#else #else
#define SSL_STATIC static #define SSL_STATIC static
#endif #endif
SSL_STATIC my_bool opt_use_ssl = 0; SSL_STATIC my_bool opt_use_ssl = 0;
SSL_STATIC char *opt_ssl_ca = 0; SSL_STATIC char *opt_ssl_ca = 0;
SSL_STATIC char *opt_ssl_capath = 0; SSL_STATIC char *opt_ssl_capath = 0;
SSL_STATIC char *opt_ssl_cert = 0; SSL_STATIC char *opt_ssl_cert = 0;
SSL_STATIC char *opt_ssl_cipher = 0; SSL_STATIC char *opt_ssl_cipher = 0;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/