| 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.23" | #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.24" | |||
| #define SHAREDIR "/home/ut/testing/mysql/5.5.23/share" | #define SHAREDIR "/home/ut/testing/mysql/5.5.24/share" | |||
| #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.23" | #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.24" | |||
| #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.23/data" | #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.24/data" | |||
| #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.23" | #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.24" | |||
| #define PLUGINDIR "/home/ut/testing/mysql/5.5.23/lib/plugin" | #define PLUGINDIR "/home/ut/testing/mysql/5.5.24/lib/plugin" | |||
| #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.23/etc" | #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.24/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.23" | #define PACKAGE_STRING "MySQL Server 5.5.24" | |||
| #define PACKAGE_TARNAME "mysql" | #define PACKAGE_TARNAME "mysql" | |||
| #define PACKAGE_VERSION "5.5.23" | #define PACKAGE_VERSION "5.5.24" | |||
| #define VERSION "5.5.23" | #define VERSION "5.5.24" | |||
| #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.23" | #define MYSQL_SERVER_VERSION "5.5.24" | |||
| #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 50523 | #define MYSQL_VERSION_ID 50524 | |||
| #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 727 | skipping to change at line 727 | |||
| { "ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT", 1714, "INSERT IGNORE... SELECT i s unsafe because the order in which rows are retrieved by the SELECT determ ines which (if any) rows are ignored. This order cannot be predicted and ma y differ on master and the slave." }, | { "ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT", 1714, "INSERT IGNORE... SELECT i s unsafe because the order in which rows are retrieved by the SELECT determ ines which (if any) rows are ignored. This order cannot be predicted and ma y differ on master and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE", 1715, "INSERT... SELECT... ON DU PLICATE KEY UPDATE is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are updated. This order cannot be predicted and may differ on master and the slave." }, | { "ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE", 1715, "INSERT... SELECT... ON DU PLICATE KEY UPDATE is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are updated. This order cannot be predicted and may differ on master and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_REPLACE_SELECT", 1716, "REPLACE... SELECT is unsafe bec ause the order in which rows are retrieved by the SELECT determines which ( if any) rows are replaced. This order cannot be predicted and may differ on master and the slave." }, | { "ER_BINLOG_UNSAFE_REPLACE_SELECT", 1716, "REPLACE... SELECT is unsafe bec ause the order in which rows are retrieved by the SELECT determines which ( if any) rows are replaced. This order cannot be predicted and may differ on master and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT", 1717, "CREATE... IGNORE SELECT i s unsafe because the order in which rows are retrieved by the SELECT determ ines which (if any) rows are ignored. This order cannot be predicted and ma y differ on master and the slave." }, | { "ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT", 1717, "CREATE... IGNORE SELECT i s unsafe because the order in which rows are retrieved by the SELECT determ ines which (if any) rows are ignored. This order cannot be predicted and ma y differ on master and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT", 1718, "CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT dete rmines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave." }, | { "ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT", 1718, "CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT dete rmines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_UPDATE_IGNORE", 1719, "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are igno red. This order cannot be predicted and may differ on master and the slave. " }, | { "ER_BINLOG_UNSAFE_UPDATE_IGNORE", 1719, "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are igno red. This order cannot be predicted and may differ on master and the slave. " }, | |||
| { "ER_PLUGIN_NO_UNINSTALL", 1720, "Plugin \'%s\' is marked as not dynamical ly uninstallable. You have to stop the server to uninstall it." }, | { "ER_PLUGIN_NO_UNINSTALL", 1720, "Plugin \'%s\' is marked as not dynamical ly uninstallable. You have to stop the server to uninstall it." }, | |||
| { "ER_PLUGIN_NO_INSTALL", 1721, "Plugin \'%s\' is marked as not dynamically installable. You have to stop the server to install it." }, | { "ER_PLUGIN_NO_INSTALL", 1721, "Plugin \'%s\' is marked as not dynamically installable. You have to stop the server to install it." }, | |||
| { "ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT", 1722, "Statements writing to a t able with an auto-increment column after selecting from another table are u nsafe because the order in which rows are retrieved determines what (if any ) rows will be written. This order cannot be predicted and may differ on ma ster and the slave." }, | { "ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT", 1722, "Statements writing to a t able with an auto-increment column after selecting from another table are u nsafe because the order in which rows are retrieved determines what (if any ) rows will be written. This order cannot be predicted and may differ on ma ster and the slave." }, | |||
| { "ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC", 1723, "CREATE TABLE... SELECT.. . on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are i nserted. This order cannot be predicted and may differ on master and the sl ave." }, | { "ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC", 1723, "CREATE TABLE... SELECT.. . on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are i nserted. This order cannot be predicted and may differ on master and the sl ave." }, | |||
| { "ER_BINLOG_UNSAFE_INSERT_TWO_KEYS", 1724, "INSERT... ON DUPLICATE KEY UPD | ||||
| ATE on a table with more than one UNIQUE KEY is unsafe" }, | ||||
| { "ER_TABLE_IN_FK_CHECK", 1725, "Table is being used in foreign key check." | ||||
| }, | ||||
| { "ER_UNSUPPORTED_ENGINE", 1726, "Storage engine \'%s\' does not support sy | ||||
| stem tables. [%s.%s]" }, | ||||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 0 lines changed or added | |||
| mysqld_error.h | mysqld_error.h | |||
|---|---|---|---|---|
| skipping to change at line 728 | skipping to change at line 728 | |||
| #define ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT 1714 | #define ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT 1714 | |||
| #define ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE 1715 | #define ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE 1715 | |||
| #define ER_BINLOG_UNSAFE_REPLACE_SELECT 1716 | #define ER_BINLOG_UNSAFE_REPLACE_SELECT 1716 | |||
| #define ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT 1717 | #define ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT 1717 | |||
| #define ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT 1718 | #define ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT 1718 | |||
| #define ER_BINLOG_UNSAFE_UPDATE_IGNORE 1719 | #define ER_BINLOG_UNSAFE_UPDATE_IGNORE 1719 | |||
| #define ER_PLUGIN_NO_UNINSTALL 1720 | #define ER_PLUGIN_NO_UNINSTALL 1720 | |||
| #define ER_PLUGIN_NO_INSTALL 1721 | #define ER_PLUGIN_NO_INSTALL 1721 | |||
| #define ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT 1722 | #define ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT 1722 | |||
| #define ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC 1723 | #define ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC 1723 | |||
| #define ER_ERROR_LAST 1723 | #define ER_BINLOG_UNSAFE_INSERT_TWO_KEYS 1724 | |||
| #define ER_TABLE_IN_FK_CHECK 1725 | ||||
| #define ER_UNSUPPORTED_ENGINE 1726 | ||||
| #define ER_ERROR_LAST 1726 | ||||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 0 lines changed or added | |||