errmsg.h   errmsg.h 
#ifndef ERRMSG_INCLUDED #ifndef ERRMSG_INCLUDED
#define ERRMSG_INCLUDED #define ERRMSG_INCLUDED
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reser ved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License. the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
skipping to change at line 35 skipping to change at line 35
void init_client_errs(void); void init_client_errs(void);
void finish_client_errs(void); void finish_client_errs(void);
extern const char *client_errors[]; /* Error messages */ extern const char *client_errors[]; /* Error messages */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#define CR_MIN_ERROR 2000 /* For easier client code */ #define CR_MIN_ERROR 2000 /* For easier client code */
#define CR_MAX_ERROR 2999 #define CR_MAX_ERROR 2999
#if !defined(ER) #if !defined(ER)
#define ER(X) client_errors[(X)-CR_MIN_ERROR] #define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_
ERROR])
#endif #endif
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
/* Do not add error numbers before CR_ERROR_FIRST. */ /* Do not add error numbers before CR_ERROR_FIRST. */
/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */ /* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
#define CR_ERROR_FIRST 2000 /*Copy first error nr.*/ #define CR_ERROR_FIRST 2000 /*Copy first error nr.*/
#define CR_UNKNOWN_ERROR 2000 #define CR_UNKNOWN_ERROR 2000
#define CR_SOCKET_CREATE_ERROR 2001 #define CR_SOCKET_CREATE_ERROR 2001
#define CR_CONNECTION_ERROR 2002 #define CR_CONNECTION_ERROR 2002
#define CR_CONN_HOST_ERROR 2003 #define CR_CONN_HOST_ERROR 2003
 End of changes. 2 change blocks. 
2 lines changed or deleted 5 lines changed or added


 my_config.h   my_config.h 
skipping to change at line 22 skipping to change at line 22
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#ifndef MY_CONFIG_H #ifndef MY_CONFIG_H
#define MY_CONFIG_H #define MY_CONFIG_H
#define DOT_FRM_VERSION 6 #define DOT_FRM_VERSION 6
/* Headers we may want to use. */ /* Headers we may want to use. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
/* #undef HAVE_LLVM_LIBCPP */
#define HAVE_ALLOCA_H 1 #define HAVE_ALLOCA_H 1
#define HAVE_AIO_H 1 #define HAVE_AIO_H 1
#define HAVE_ARPA_INET_H 1 #define HAVE_ARPA_INET_H 1
#define HAVE_ASM_MSR_H 1 #define HAVE_ASM_MSR_H 1
#define HAVE_ASM_TERMBITS_H 1 #define HAVE_ASM_TERMBITS_H 1
#define HAVE_BSEARCH 1 #define HAVE_BSEARCH 1
#define HAVE_CRYPT_H 1 #define HAVE_CRYPT_H 1
#define HAVE_CURSES_H 1 #define HAVE_CURSES_H 1
/* #undef HAVE_CXXABI_H */ /* #undef HAVE_CXXABI_H */
/* #undef HAVE_NCURSES_H */ /* #undef HAVE_NCURSES_H */
skipping to change at line 629 skipping to change at line 630
/* #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.17" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.6.19"
#define SHAREDIR "/home/ut/testing/mysql/5.6.17/share" #define SHAREDIR "/home/ut/testing/mysql/5.6.19/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.17" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.19"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.17/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.19/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.17" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.19"
#define PLUGINDIR "/home/ut/testing/mysql/5.6.17/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.6.19/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.17/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.19/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 17 #define MYSQL_VERSION_PATCH 19
#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.17" #define PACKAGE_STRING "MySQL Server 5.6.19"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.6.17" #define PACKAGE_VERSION "5.6.19"
#define VERSION "5.6.17" #define VERSION "5.6.19"
#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. 5 change blocks. 
11 lines changed or deleted 12 lines changed or added


 my_global.h   my_global.h 
skipping to change at line 762 skipping to change at line 762
#define FLT_MIN ((float)1.40129846432481707e-45) #define FLT_MIN ((float)1.40129846432481707e-45)
#endif #endif
#ifndef DBL_MAX #ifndef DBL_MAX
#define DBL_MAX 1.79769313486231470e+308 #define DBL_MAX 1.79769313486231470e+308
#define FLT_MAX ((float)3.40282346638528860e+38) #define FLT_MAX ((float)3.40282346638528860e+38)
#endif #endif
#ifndef SIZE_T_MAX #ifndef SIZE_T_MAX
#define SIZE_T_MAX (~((size_t) 0)) #define SIZE_T_MAX (~((size_t) 0))
#endif #endif
#ifndef isfinite
#ifdef HAVE_FINITE
#define isfinite(x) finite(x)
#else
#define finite(x) (1.0 / fabs(x) > 0.0)
#endif /* HAVE_FINITE */
#endif /* isfinite */
#include <math.h> #include <math.h>
#ifndef HAVE_ISNAN
#define isnan(x) ((x) != (x))
#endif
C_MODE_START
extern double my_double_isnan(double x);
C_MODE_END
#ifdef HAVE_ISINF #if (__cplusplus >= 201103L)
/* Check if C compiler is affected by GCC bug #39228 */ /* For C++11 use the new std functions rather than C99 macros. */
#if !defined(__cplusplus) && defined(HAVE_BROKEN_ISINF) #include <cmath>
/* Force store/reload of the argument to/from a 64-bit double */ #define my_isfinite(X) std::isfinite(X)
static inline double my_isinf(double x) #define my_isnan(X) std::isnan(X)
{ #define my_isinf(X) std::isinf(X)
volatile double t= x;
return isinf(t);
}
#else #else
/* System-provided isinf() is available and safe to use */ #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
#define my_isinf(X) isinf(X) #define my_isfinite(X) isfinite(X)
#endif #else
#else /* !HAVE_ISINF */ #define my_isfinite(X) finite(X)
#define my_isinf(X) (!finite(X) && !isnan(X)) #endif
#endif #define my_isnan(X) isnan(X)
#ifdef HAVE_ISINF
/* System-provided isinf() is available and safe to use */
#define my_isinf(X) isinf(X)
#else /* !HAVE_ISINF */
#define my_isinf(X) (!my_isfinite(X) && !my_isnan(X))
#endif
#endif /* __cplusplus >= 201103L */
/* Define missing math constants. */ /* Define missing math constants. */
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#endif #endif
#ifndef M_E #ifndef M_E
#define M_E 2.7182818284590452354 #define M_E 2.7182818284590452354
#endif #endif
#ifndef M_LN2 #ifndef M_LN2
#define M_LN2 0.69314718055994530942 #define M_LN2 0.69314718055994530942
 End of changes. 4 change blocks. 
29 lines changed or deleted 19 lines changed or added


 mysql_version.h   mysql_version.h 
skipping to change at line 14 skipping to change at line 14
*/ */
/* 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.17" #define MYSQL_SERVER_VERSION "5.6.19"
#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 50617 #define MYSQL_VERSION_ID 50619
#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/