my_config.h | my_config.h | |||
---|---|---|---|---|
skipping to change at line 588 | skipping to change at line 588 | |||
/* #undef WITH_MYISAMMRG_STORAGE_ENGINE */ | /* #undef WITH_MYISAMMRG_STORAGE_ENGINE */ | |||
/* #undef WITH_HEAP_STORAGE_ENGINE */ | /* #undef WITH_HEAP_STORAGE_ENGINE */ | |||
/* #undef WITH_CSV_STORAGE_ENGINE */ | /* #undef WITH_CSV_STORAGE_ENGINE */ | |||
/* #undef WITH_PARTITION_STORAGE_ENGINE */ | /* #undef WITH_PARTITION_STORAGE_ENGINE */ | |||
/* #undef WITH_PERFSCHEMA_STORAGE_ENGINE */ | /* #undef WITH_PERFSCHEMA_STORAGE_ENGINE */ | |||
/* #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/ut/testing/mysql/5.5.33" | #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.34" | |||
#define SHAREDIR "/home/ut/testing/mysql/5.5.33/share" | #define SHAREDIR "/home/ut/testing/mysql/5.5.34/share" | |||
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.33" | #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.34" | |||
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.33/data" | #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.34/data" | |||
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.33" | #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.34" | |||
#define PLUGINDIR "/home/ut/testing/mysql/5.5.33/lib/plugin" | #define PLUGINDIR "/home/ut/testing/mysql/5.5.34/lib/plugin" | |||
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.33/etc" | #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.34/etc" | |||
/* #undef SO_EXT */ | /* #undef SO_EXT */ | |||
#define MYSQL_MAJOR_VERSION 5 | #define MYSQL_MAJOR_VERSION 5 | |||
#define MYSQL_MINOR_VERSION 5 | #define MYSQL_MINOR_VERSION 5 | |||
#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.33" | #define PACKAGE_STRING "MySQL Server 5.5.34" | |||
#define PACKAGE_TARNAME "mysql" | #define PACKAGE_TARNAME "mysql" | |||
#define PACKAGE_VERSION "5.5.33" | #define PACKAGE_VERSION "5.5.34" | |||
#define VERSION "5.5.33" | #define VERSION "5.5.34" | |||
#define PROTOCOL_VERSION 10 | #define PROTOCOL_VERSION 10 | |||
/* time_t related defines */ | /* time_t related defines */ | |||
#define SIZEOF_TIME_T 4 | #define SIZEOF_TIME_T 4 | |||
/* #undef TIME_T_UNSIGNED */ | /* #undef TIME_T_UNSIGNED */ | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
10 lines changed or deleted | 10 lines changed or added | |||
mysql_version.h | mysql_version.h | |||
---|---|---|---|---|
skipping to change at line 13 | skipping to change at line 13 | |||
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.33" | #define MYSQL_SERVER_VERSION "5.5.34" | |||
#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 50533 | #define MYSQL_VERSION_ID 50534 | |||
#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_audit.h | plugin_audit.h | |||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
#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 0x0300 | #define MYSQL_AUDIT_INTERFACE_VERSION 0x0301 | |||
/************************************************************************* | /************************************************************************* | |||
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. | |||
STATUS events occur after transmitting a resultset or errors | STATUS events occur after transmitting a resultset or errors | |||
to the user. | to the user. | |||
*/ | */ | |||
skipping to change at line 61 | skipping to change at line 61 | |||
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; | |||
unsigned long long general_rows; | unsigned long long general_rows; | |||
MYSQL_LEX_STRING general_host; | ||||
MYSQL_LEX_STRING general_sql_command; | ||||
MYSQL_LEX_STRING general_external_user; | ||||
MYSQL_LEX_STRING general_ip; | ||||
}; | }; | |||
/* | /* | |||
AUDIT CLASS : CONNECTION | AUDIT CLASS : CONNECTION | |||
CONNECT occurs after authentication phase is completed. | CONNECT occurs after authentication phase is completed. | |||
DISCONNECT occurs after connection is terminated. | DISCONNECT occurs after connection is terminated. | |||
CHANGE_USER occurs after COM_CHANGE_USER RPC is completed. | CHANGE_USER occurs after COM_CHANGE_USER RPC is completed. | |||
*/ | */ | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 5 lines changed or added | |||