my_config.h   my_config.h 
skipping to change at line 588 skipping to change at line 588
#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/ut/testing/mysql/5.5.27" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.28"
#define SHAREDIR "/home/ut/testing/mysql/5.5.27/share" #define SHAREDIR "/home/ut/testing/mysql/5.5.28/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.27" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.28"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.27/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.28/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.27" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.28"
#define PLUGINDIR "/home/ut/testing/mysql/5.5.27/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.5.28/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.27/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.28/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.27" #define PACKAGE_STRING "MySQL Server 5.5.28"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.5.27" #define PACKAGE_VERSION "5.5.28"
#define VERSION "5.5.27" #define VERSION "5.5.28"
#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 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.27" #define MYSQL_SERVER_VERSION "5.5.28"
#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 50527 #define MYSQL_VERSION_ID 50528
#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 684 skipping to change at line 684
{ "ER_BINLOG_UNSAFE_AUTOINC_COLUMNS", 1671, "Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly." }, { "ER_BINLOG_UNSAFE_AUTOINC_COLUMNS", 1671, "Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly." },
{ "ER_BINLOG_UNSAFE_UDF", 1672, "Statement is unsafe because it uses a UDF which may not return the same value on the slave." }, { "ER_BINLOG_UNSAFE_UDF", 1672, "Statement is unsafe because it uses a UDF which may not return the same value on the slave." },
{ "ER_BINLOG_UNSAFE_SYSTEM_VARIABLE", 1673, "Statement is unsafe because it uses a system variable that may have a different value on the slave." }, { "ER_BINLOG_UNSAFE_SYSTEM_VARIABLE", 1673, "Statement is unsafe because it uses a system variable that may have a different value on the slave." },
{ "ER_BINLOG_UNSAFE_SYSTEM_FUNCTION", 1674, "Statement is unsafe because it uses a system function that may return a different value on the slave." }, { "ER_BINLOG_UNSAFE_SYSTEM_FUNCTION", 1674, "Statement is unsafe because it uses a system function that may return a different value on the slave." },
{ "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_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, "\'%s\' is deprecated a nd will be removed in a future release." },
{ "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_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 based type in LIMIT clause" }, { "ER_WRONG_SPVAR_TYPE_IN_LIMIT", 1691, "A variable of a non-integer based type in LIMIT clause" },
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 thread_pool_priv.h   thread_pool_priv.h 
skipping to change at line 38 skipping to change at line 38
debug_sync.h debug_sync.h
To handle definitions of Information Schema plugins it is also required To handle definitions of Information Schema plugins it is also required
to include sql_profile.h and table.h. to include sql_profile.h and table.h.
*/ */
#include <mysqld_error.h> /* To get ER_ERROR_ON_READ */ #include <mysqld_error.h> /* To get ER_ERROR_ON_READ */
#define MYSQL_SERVER 1 #define MYSQL_SERVER 1
#include <scheduler.h> #include <scheduler.h>
#include <debug_sync.h> #include <debug_sync.h>
#include <sql_profile.h> #include <sql_profile.h>
#include <table.h> #include <table.h>
#include <sql_list.h>
/* Needed to get access to scheduler variables */ /* Needed to get access to scheduler variables */
void* thd_get_scheduler_data(THD *thd); void* thd_get_scheduler_data(THD *thd);
void thd_set_scheduler_data(THD *thd, void *data); void thd_set_scheduler_data(THD *thd, void *data);
PSI_thread* thd_get_psi(THD *thd); PSI_thread* thd_get_psi(THD *thd);
void thd_set_psi(THD *thd, PSI_thread *psi); void thd_set_psi(THD *thd, PSI_thread *psi);
/* Interface to THD variables and functions */ /* Interface to THD variables and functions */
void thd_set_killed(THD *thd); void thd_set_killed(THD *thd);
void thd_clear_errors(THD *thd); void thd_clear_errors(THD *thd);
skipping to change at line 59 skipping to change at line 60
void thd_lock_thread_count(THD *thd); void thd_lock_thread_count(THD *thd);
void thd_unlock_thread_count(THD *thd); void thd_unlock_thread_count(THD *thd);
void thd_close_connection(THD *thd); void thd_close_connection(THD *thd);
THD *thd_get_current_thd(); THD *thd_get_current_thd();
void thd_new_connection_setup(THD *thd, char *stack_start); void thd_new_connection_setup(THD *thd, char *stack_start);
void thd_lock_data(THD *thd); void thd_lock_data(THD *thd);
void thd_unlock_data(THD *thd); void thd_unlock_data(THD *thd);
bool thd_is_transaction_active(THD *thd); bool thd_is_transaction_active(THD *thd);
int thd_connection_has_data(THD *thd); int thd_connection_has_data(THD *thd);
void thd_set_net_read_write(THD *thd, uint val); void thd_set_net_read_write(THD *thd, uint val);
uint thd_get_net_read_write(THD *thd);
void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var); void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
ulong thd_get_net_wait_timeout(THD *thd);
my_socket thd_get_fd(THD *thd); my_socket thd_get_fd(THD *thd);
THD *first_global_thread();
THD *next_global_thread(THD *thd);
/* Print to the MySQL error log */ /* Print to the MySQL error log */
void sql_print_error(const char *format, ...); void sql_print_error(const char *format, ...);
/* Store a table record */ /* Store a table record */
bool schema_table_store_record(THD *thd, TABLE *table); bool schema_table_store_record(THD *thd, TABLE *table);
/* /*
The thread pool must be able to execute statements using the connection The thread pool must be able to execute statements using the connection
state in THD object. This is the main objective of the thread pool to state in THD object. This is the main objective of the thread pool to
schedule the start of these commands. schedule the start of these commands.
 End of changes. 4 change blocks. 
0 lines changed or deleted 6 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/