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.28" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.29"
#define SHAREDIR "/home/ut/testing/mysql/5.5.28/share" #define SHAREDIR "/home/ut/testing/mysql/5.5.29/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.28" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.29"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.28/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.29/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.28" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.29"
#define PLUGINDIR "/home/ut/testing/mysql/5.5.28/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.5.29/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.28/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.29/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.28" #define PACKAGE_STRING "MySQL Server 5.5.29"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.5.28" #define PACKAGE_VERSION "5.5.29"
#define VERSION "5.5.28" #define VERSION "5.5.29"
#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.28" #define MYSQL_SERVER_VERSION "5.5.29"
#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 50528 #define MYSQL_VERSION_ID 50529
#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

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/