my_config.h | my_config.h | |||
---|---|---|---|---|
skipping to change at line 1141 | skipping to change at line 1141 | |||
/* Name of package */ | /* Name of package */ | |||
#define PACKAGE "mysql" | #define PACKAGE "mysql" | |||
/* Define to the address where bug reports for this package should be sent. */ | /* Define to the address where bug reports for this package should be sent. */ | |||
#define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT "" | |||
/* Define to the full name of this package. */ | /* Define to the full name of this package. */ | |||
#define PACKAGE_NAME "MySQL Server" | #define PACKAGE_NAME "MySQL Server" | |||
/* Define to the full name and version of this package. */ | /* Define to the full name and version of this package. */ | |||
#define PACKAGE_STRING "MySQL Server 5.1.44" | #define PACKAGE_STRING "MySQL Server 5.1.46" | |||
/* Define to the one symbol short name of this package. */ | /* Define to the one symbol short name of this package. */ | |||
#define PACKAGE_TARNAME "mysql" | #define PACKAGE_TARNAME "mysql" | |||
/* Define to the version of this package. */ | /* Define to the version of this package. */ | |||
#define PACKAGE_VERSION "5.1.44" | #define PACKAGE_VERSION "5.1.46" | |||
/* mysql client protocol version */ | /* mysql client protocol version */ | |||
#define PROTOCOL_VERSION 10 | #define PROTOCOL_VERSION 10 | |||
/* qsort returns void */ | /* qsort returns void */ | |||
#define QSORT_TYPE_IS_VOID 1 | #define QSORT_TYPE_IS_VOID 1 | |||
/* The return type of qsort (int or void). */ | /* The return type of qsort (int or void). */ | |||
#define RETQSORTTYPE void | #define RETQSORTTYPE void | |||
skipping to change at line 1272 | skipping to change at line 1272 | |||
/* #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.1.44" | #define VERSION "5.1.46" | |||
/* sighandler type is void (*signal ()) (); */ | /* sighandler type is void (*signal ()) (); */ | |||
#define VOID_SIGHANDLER 1 | #define VOID_SIGHANDLER 1 | |||
/* Include Archive Storage Engine into mysqld */ | /* Include Archive Storage Engine into mysqld */ | |||
/* #undef WITH_ARCHIVE_STORAGE_ENGINE */ | /* #undef WITH_ARCHIVE_STORAGE_ENGINE */ | |||
/* Include Basic Write-only Read-never tables into mysqld */ | /* Include Basic Write-only Read-never tables into mysqld */ | |||
/* #undef WITH_BLACKHOLE_STORAGE_ENGINE */ | /* #undef WITH_BLACKHOLE_STORAGE_ENGINE */ | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
my_sys.h | my_sys.h | |||
---|---|---|---|---|
skipping to change at line 950 | skipping to change at line 950 | |||
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. 1 change blocks. | ||||
1 lines changed or deleted | 1 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.1.44" | #define MYSQL_SERVER_VERSION "5.1.46" | |||
#define MYSQL_BASE_VERSION "mysqld-5.1" | #define MYSQL_BASE_VERSION "mysqld-5.1" | |||
#define MYSQL_SERVER_SUFFIX_DEF "" | #define MYSQL_SERVER_SUFFIX_DEF "" | |||
#define FRM_VER 6 | #define FRM_VER 6 | |||
#define MYSQL_VERSION_ID 50144 | #define MYSQL_VERSION_ID 50146 | |||
#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 | |||
plugin.h | plugin.h | |||
---|---|---|---|---|
skipping to change at line 390 | skipping to change at line 390 | |||
/* | /* | |||
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) | |||
*/ | */ | |||
#define MYSQL_FTPARSER_INTERFACE_VERSION 0x0100 | #define MYSQL_FTPARSER_INTERFACE_VERSION 0x0100 | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||