m_ctype.h   m_ctype.h 
skipping to change at line 366 skipping to change at line 366
/* Helper functions to handle contraction */ /* Helper functions to handle contraction */
static inline my_bool static inline my_bool
my_cs_have_contractions(CHARSET_INFO *cs) my_cs_have_contractions(CHARSET_INFO *cs)
{ {
return cs->contractions != NULL; return cs->contractions != NULL;
} }
static inline my_bool static inline my_bool
my_cs_can_be_contraction_head(CHARSET_INFO *cs, my_wc_t wc) my_cs_can_be_contraction_head(CHARSET_INFO *cs, my_wc_t wc)
{ {
return ((const char *)cs->contractions)[0x40*0x40 + (wc & 0xFF)]; return ((const char *) cs->contractions)[0x40 * 0x40 * 2 + (wc & 0xFF)];
} }
static inline my_bool static inline my_bool
my_cs_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc) my_cs_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc)
{ {
return ((const char *)cs->contractions)[0x40*0x40 + (wc & 0xFF)]; return ((const char *) cs->contractions)[0x40 * 0x40 * 2 + (wc & 0xFF)];
} }
static inline uint16* static inline uint16*
my_cs_contraction2_weight(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2) my_cs_contraction2_weight(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2)
{ {
return &cs->contractions[(wc1 - 0x40) * 0x40 + wc2 - 0x40]; return &cs->contractions[(wc1 - 0x40) * 0x40 + wc2 - 0x40];
} }
/* declarations for simple charsets */ /* declarations for simple charsets */
extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t,
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 my_config.h   my_config.h 
skipping to change at line 588 skipping to change at line 588
/* #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 */
/* #undef WITH_PARTITION_STORAGE_ENGINE */ /* #undef WITH_PARTITION_STORAGE_ENGINE */
/* #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.5.36" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.37"
#define SHAREDIR "/home/ut/testing/mysql/5.5.36/share" #define SHAREDIR "/home/ut/testing/mysql/5.5.37/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.36" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.37"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.36/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.37/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.36" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.37"
#define PLUGINDIR "/home/ut/testing/mysql/5.5.36/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.5.37/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.36/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.37/etc"
#define DEFAULT_TMPDIR P_tmpdir #define DEFAULT_TMPDIR P_tmpdir
/* #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.36" #define PACKAGE_STRING "MySQL Server 5.5.37"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.5.36" #define PACKAGE_VERSION "5.5.37"
#define VERSION "5.5.36" #define VERSION "5.5.37"
#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 
/* 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.5.36" #define MYSQL_SERVER_VERSION "5.5.37"
#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 50536 #define MYSQL_VERSION_ID 50537
#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

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