| m_string.h | | m_string.h | |
| | | | |
| skipping to change at line 111 | | skipping to change at line 111 | |
| #endif | | #endif | |
| #endif | | #endif | |
| | | | |
| /* Declared in int2str() */ | | /* Declared in int2str() */ | |
| extern char NEAR _dig_vec_upper[]; | | extern char NEAR _dig_vec_upper[]; | |
| extern char NEAR _dig_vec_lower[]; | | extern char NEAR _dig_vec_lower[]; | |
| | | | |
| /* Defined in strtod.c */ | | /* Defined in strtod.c */ | |
| extern const double log_10[309]; | | extern const double log_10[309]; | |
| | | | |
|
| #ifdef BAD_STRING_COMPILER | | #ifndef strmov | |
| #define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1) | | | |
| #else | | | |
| #define strmov_overlapp(A,B) strmov(A,B) | | #define strmov_overlapp(A,B) strmov(A,B) | |
| #define strmake_overlapp(A,B,C) strmake(A,B,C) | | #define strmake_overlapp(A,B,C) strmake(A,B,C) | |
| #endif | | #endif | |
| | | | |
| #ifdef BAD_MEMCPY /* Problem with gcc on Alpha */ | | #ifdef BAD_MEMCPY /* Problem with gcc on Alpha */ | |
| #define memcpy_fixed(A,B,C) bmove((A),(B),(C)) | | #define memcpy_fixed(A,B,C) bmove((A),(B),(C)) | |
| #else | | #else | |
| #define memcpy_fixed(A,B,C) memcpy((A),(B),(C)) | | #define memcpy_fixed(A,B,C) memcpy((A),(B),(C)) | |
| #endif | | #endif | |
| | | | |
| | | | |
| skipping to change at line 174 | | skipping to change at line 172 | |
| extern void strappend(char *s,uint len,pchar fill); | | extern void strappend(char *s,uint len,pchar fill); | |
| extern char *strend(const char *s); | | extern char *strend(const char *s); | |
| extern char *strcend(const char *, pchar); | | extern char *strcend(const char *, pchar); | |
| extern char *strfield(char *src,int fields,int chars,int blanks, | | extern char *strfield(char *src,int fields,int chars,int blanks, | |
| int tabch); | | int tabch); | |
| extern char *strfill(my_string s,uint len,pchar fill); | | extern char *strfill(my_string s,uint len,pchar fill); | |
| extern uint strinstr(const char *str,const char *search); | | extern uint strinstr(const char *str,const char *search); | |
| extern uint r_strinstr(reg1 my_string str,int from, reg4 my_string search)
; | | extern uint r_strinstr(reg1 my_string str,int from, reg4 my_string search)
; | |
| extern char *strkey(char *dst,char *head,char *tail,char *flags); | | extern char *strkey(char *dst,char *head,char *tail,char *flags); | |
| extern char *strmake(char *dst,const char *src,uint length); | | extern char *strmake(char *dst,const char *src,uint length); | |
|
| #ifndef strmake_overlapp | | | |
| extern char *strmake_overlapp(char *dst,const char *src, uint length); | | | |
| #endif | | | |
| | | | |
| #ifndef strmov | | #ifndef strmov | |
| extern char *strmov(char *dst,const char *src); | | extern char *strmov(char *dst,const char *src); | |
|
| | | #else | |
| | | extern char *strmov_overlapp(char *dst,const char *src); | |
| #endif | | #endif | |
| extern char *strnmov(char *dst,const char *src,uint n); | | extern char *strnmov(char *dst,const char *src,uint n); | |
| extern char *strsuff(const char *src,const char *suffix); | | extern char *strsuff(const char *src,const char *suffix); | |
| extern char *strcont(const char *src,const char *set); | | extern char *strcont(const char *src,const char *set); | |
| extern char *strxcat _VARARGS((char *dst,const char *src, ...)); | | extern char *strxcat _VARARGS((char *dst,const char *src, ...)); | |
| extern char *strxmov _VARARGS((char *dst,const char *src, ...)); | | extern char *strxmov _VARARGS((char *dst,const char *src, ...)); | |
| extern char *strxcpy _VARARGS((char *dst,const char *src, ...)); | | extern char *strxcpy _VARARGS((char *dst,const char *src, ...)); | |
| extern char *strxncat _VARARGS((char *dst,uint len, const char *src, ...)); | | extern char *strxncat _VARARGS((char *dst,uint len, const char *src, ...)); | |
| extern char *strxnmov _VARARGS((char *dst,uint len, const char *src, ...)); | | extern char *strxnmov _VARARGS((char *dst,uint len, const char *src, ...)); | |
| extern char *strxncpy _VARARGS((char *dst,uint len, const char *src, ...)); | | extern char *strxncpy _VARARGS((char *dst,uint len, const char *src, ...)); | |
| | | | |
End of changes. 3 change blocks. |
| 6 lines changed or deleted | | 3 lines changed or added | |
|
| my_config.h | | my_config.h | |
| | | | |
| skipping to change at line 1006 | | skipping to change at line 1006 | |
| /* Define the default charset name */ | | /* Define the default charset name */ | |
| #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" | | #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" | |
| | | | |
| /* Including Ndb Cluster DB sci transporter */ | | /* Including Ndb Cluster DB sci transporter */ | |
| /* #undef NDB_SCI_TRANSPORTER */ | | /* #undef NDB_SCI_TRANSPORTER */ | |
| | | | |
| /* Including Ndb Cluster DB shared memory transporter */ | | /* Including Ndb Cluster DB shared memory transporter */ | |
| /* #undef NDB_SHM_TRANSPORTER */ | | /* #undef NDB_SHM_TRANSPORTER */ | |
| | | | |
| /* NDB build version */ | | /* NDB build version */ | |
|
| #define NDB_VERSION_BUILD 89 | | #define NDB_VERSION_BUILD 90 | |
| | | | |
| /* NDB major version */ | | /* NDB major version */ | |
| #define NDB_VERSION_MAJOR 5 | | #define NDB_VERSION_MAJOR 5 | |
| | | | |
| /* NDB minor version */ | | /* NDB minor version */ | |
| #define NDB_VERSION_MINOR 0 | | #define NDB_VERSION_MINOR 0 | |
| | | | |
| /* NDB status version */ | | /* NDB status version */ | |
| #define NDB_VERSION_STATUS "" | | #define NDB_VERSION_STATUS "" | |
| | | | |
| | | | |
| skipping to change at line 1152 | | skipping to change at line 1152 | |
| /* #undef USE_MYSYS_NEW */ | | /* #undef USE_MYSYS_NEW */ | |
| | | | |
| /* used new readline interface (are rl_completion_func_t and | | /* used new readline interface (are rl_completion_func_t and | |
| rl_compentry_func_t defined) */ | | rl_compentry_func_t defined) */ | |
| /* #undef USE_NEW_READLINE_INTERFACE */ | | /* #undef USE_NEW_READLINE_INTERFACE */ | |
| | | | |
| /* the pstack backtrace library */ | | /* the pstack backtrace library */ | |
| /* #undef USE_PSTACK */ | | /* #undef USE_PSTACK */ | |
| | | | |
| /* Version number of package */ | | /* Version number of package */ | |
|
| #define VERSION "5.0.89" | | #define VERSION "5.0.90" | |
| | | | |
| /* sighandler type is void (*signal ()) (); */ | | /* sighandler type is void (*signal ()) (); */ | |
| #define VOID_SIGHANDLER 1 | | #define VOID_SIGHANDLER 1 | |
| | | | |
| /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most | | /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most | |
| significant byte first (like Motorola and SPARC, unlike Intel). */ | | significant byte first (like Motorola and SPARC, unlike Intel). */ | |
| #if defined AC_APPLE_UNIVERSAL_BUILD | | #if defined AC_APPLE_UNIVERSAL_BUILD | |
| # if defined __BIG_ENDIAN__ | | # if defined __BIG_ENDIAN__ | |
| # define WORDS_BIGENDIAN 1 | | # define WORDS_BIGENDIAN 1 | |
| # endif | | # endif | |
| | | | |
End of changes. 2 change blocks. |
| 2 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.0.89" | | #define MYSQL_SERVER_VERSION "5.0.90" | |
| #define MYSQL_BASE_VERSION "mysqld-5.0" | | #define MYSQL_BASE_VERSION "mysqld-5.0" | |
| #define MYSQL_SERVER_SUFFIX_DEF "" | | #define MYSQL_SERVER_SUFFIX_DEF "" | |
| #define FRM_VER 6 | | #define FRM_VER 6 | |
|
| #define MYSQL_VERSION_ID 50089 | | #define MYSQL_VERSION_ID 50090 | |
| #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 | |
|