my_config.h   my_config.h 
skipping to change at line 629 skipping to change at line 629
/* #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 */
#define WITH_PARTITION_STORAGE_ENGINE 1 #define WITH_PARTITION_STORAGE_ENGINE 1
/* #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.6.16" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.6.17"
#define SHAREDIR "/home/ut/testing/mysql/5.6.16/share" #define SHAREDIR "/home/ut/testing/mysql/5.6.17/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.16" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.17"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.16/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.17/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.16" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.17"
#define PLUGINDIR "/home/ut/testing/mysql/5.6.16/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.6.17/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.16/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.17/etc"
#define DEFAULT_TMPDIR P_tmpdir #define DEFAULT_TMPDIR P_tmpdir
/* #undef SO_EXT */ /* #undef SO_EXT */
#define MYSQL_VERSION_MAJOR 5 #define MYSQL_VERSION_MAJOR 5
#define MYSQL_VERSION_MINOR 6 #define MYSQL_VERSION_MINOR 6
#define MYSQL_VERSION_PATCH 16 #define MYSQL_VERSION_PATCH 17
#define MYSQL_VERSION_EXTRA "" #define MYSQL_VERSION_EXTRA ""
#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.6.16" #define PACKAGE_STRING "MySQL Server 5.6.17"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.6.16" #define PACKAGE_VERSION "5.6.17"
#define VERSION "5.6.16" #define VERSION "5.6.17"
#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 */
/* CPU information */ /* CPU information */
#define CPU_LEVEL1_DCACHE_LINESIZE 64 #define CPU_LEVEL1_DCACHE_LINESIZE 64
 End of changes. 4 change blocks. 
11 lines changed or deleted 11 lines changed or added


 mysql_version.h   mysql_version.h 
/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB /* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB
Use is subject to license terms & Detron HB, 1996, 1999-2004, 2007 MySQL AB.
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.6.16" #define MYSQL_SERVER_VERSION "5.6.17"
#define MYSQL_BASE_VERSION "mysqld-5.6" #define MYSQL_BASE_VERSION "mysqld-5.6"
#define MYSQL_SERVER_SUFFIX_DEF "" #define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6 #define FRM_VER 6
#define MYSQL_VERSION_ID 50616 #define MYSQL_VERSION_ID 50617
#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. 3 change blocks. 
5 lines changed or deleted 6 lines changed or added


 mysqld_ername.h   mysqld_ername.h 
skipping to change at line 885 skipping to change at line 885
{ "ER_SLAVE_RLI_INIT_REPOSITORY", 1872, "Slave failed to initialize relay l og info structure from the repository" }, { "ER_SLAVE_RLI_INIT_REPOSITORY", 1872, "Slave failed to initialize relay l og info structure from the repository" },
{ "ER_ACCESS_DENIED_CHANGE_USER_ERROR", 1873, "Access denied trying to chan ge to user \'%-.48s\'@\'%-.64s\' (using password: %s). Disconnecting." }, { "ER_ACCESS_DENIED_CHANGE_USER_ERROR", 1873, "Access denied trying to chan ge to user \'%-.48s\'@\'%-.64s\' (using password: %s). Disconnecting." },
{ "ER_INNODB_READ_ONLY", 1874, "InnoDB is in read only mode." }, { "ER_INNODB_READ_ONLY", 1874, "InnoDB is in read only mode." },
{ "ER_STOP_SLAVE_SQL_THREAD_TIMEOUT", 1875, "STOP SLAVE command execution i s incomplete: Slave SQL thread got the stop signal, thread is busy, SQL thr ead will stop once the current task is complete." }, { "ER_STOP_SLAVE_SQL_THREAD_TIMEOUT", 1875, "STOP SLAVE command execution i s incomplete: Slave SQL thread got the stop signal, thread is busy, SQL thr ead will stop once the current task is complete." },
{ "ER_STOP_SLAVE_IO_THREAD_TIMEOUT", 1876, "STOP SLAVE command execution is incomplete: Slave IO thread got the stop signal, thread is busy, IO thread will stop once the current task is complete." }, { "ER_STOP_SLAVE_IO_THREAD_TIMEOUT", 1876, "STOP SLAVE command execution is incomplete: Slave IO thread got the stop signal, thread is busy, IO thread will stop once the current task is complete." },
{ "ER_TABLE_CORRUPT", 1877, "Operation cannot be performed. The table \'%-. 64s.%-.64s\' is missing, corrupt or contains bad data." }, { "ER_TABLE_CORRUPT", 1877, "Operation cannot be performed. The table \'%-. 64s.%-.64s\' is missing, corrupt or contains bad data." },
{ "ER_TEMP_FILE_WRITE_FAILURE", 1878, "Temporary file write failure." }, { "ER_TEMP_FILE_WRITE_FAILURE", 1878, "Temporary file write failure." },
{ "ER_INNODB_FT_AUX_NOT_HEX_ID", 1879, "Upgrade index name failed, please u se create index(alter table) algorithm copy to rebuild index." }, { "ER_INNODB_FT_AUX_NOT_HEX_ID", 1879, "Upgrade index name failed, please u se create index(alter table) algorithm copy to rebuild index." },
{ "ER_OLD_TEMPORALS_UPGRADED", 1880, "TIME/TIMESTAMP/DATETIME columns of ol d format have been upgraded to the new format." }, { "ER_OLD_TEMPORALS_UPGRADED", 1880, "TIME/TIMESTAMP/DATETIME columns of ol d format have been upgraded to the new format." },
{ "ER_INNODB_FORCED_RECOVERY", 1881, "Operation not allowed when innodb_for ced_recovery > 0." }, { "ER_INNODB_FORCED_RECOVERY", 1881, "Operation not allowed when innodb_for ced_recovery > 0." },
{ "ER_AES_INVALID_IV", 1882, "The initialization vector supplied to %s is t oo short. Must be at least %d bytes long" },
 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 886 skipping to change at line 886
#define ER_SLAVE_RLI_INIT_REPOSITORY 1872 #define ER_SLAVE_RLI_INIT_REPOSITORY 1872
#define ER_ACCESS_DENIED_CHANGE_USER_ERROR 1873 #define ER_ACCESS_DENIED_CHANGE_USER_ERROR 1873
#define ER_INNODB_READ_ONLY 1874 #define ER_INNODB_READ_ONLY 1874
#define ER_STOP_SLAVE_SQL_THREAD_TIMEOUT 1875 #define ER_STOP_SLAVE_SQL_THREAD_TIMEOUT 1875
#define ER_STOP_SLAVE_IO_THREAD_TIMEOUT 1876 #define ER_STOP_SLAVE_IO_THREAD_TIMEOUT 1876
#define ER_TABLE_CORRUPT 1877 #define ER_TABLE_CORRUPT 1877
#define ER_TEMP_FILE_WRITE_FAILURE 1878 #define ER_TEMP_FILE_WRITE_FAILURE 1878
#define ER_INNODB_FT_AUX_NOT_HEX_ID 1879 #define ER_INNODB_FT_AUX_NOT_HEX_ID 1879
#define ER_OLD_TEMPORALS_UPGRADED 1880 #define ER_OLD_TEMPORALS_UPGRADED 1880
#define ER_INNODB_FORCED_RECOVERY 1881 #define ER_INNODB_FORCED_RECOVERY 1881
#define ER_ERROR_LAST 1881 #define ER_AES_INVALID_IV 1882
#define ER_ERROR_LAST 1882
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 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/