| m_ctype.h | | m_ctype.h | |
|---|
| | | | |
| skipping to change at line 342 | | skipping to change at line 342 | |
|---|
| extern CHARSET_INFO my_charset_ucs2_unicode_ci; | | extern CHARSET_INFO my_charset_ucs2_unicode_ci; | |
| extern CHARSET_INFO my_charset_ujis_japanese_ci; | | extern CHARSET_INFO my_charset_ujis_japanese_ci; | |
| extern CHARSET_INFO my_charset_ujis_bin; | | extern CHARSET_INFO my_charset_ujis_bin; | |
| extern CHARSET_INFO my_charset_utf16_bin; | | extern CHARSET_INFO my_charset_utf16_bin; | |
| extern CHARSET_INFO my_charset_utf16_general_ci; | | extern CHARSET_INFO my_charset_utf16_general_ci; | |
| extern CHARSET_INFO my_charset_utf16_unicode_ci; | | extern CHARSET_INFO my_charset_utf16_unicode_ci; | |
| extern CHARSET_INFO my_charset_utf32_bin; | | extern CHARSET_INFO my_charset_utf32_bin; | |
| extern CHARSET_INFO my_charset_utf32_general_ci; | | extern CHARSET_INFO my_charset_utf32_general_ci; | |
| extern CHARSET_INFO my_charset_utf32_unicode_ci; | | extern CHARSET_INFO my_charset_utf32_unicode_ci; | |
| | | | |
|
| extern CHARSET_INFO my_charset_utf8_general_ci; | | extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8_general_ci; | |
| extern CHARSET_INFO my_charset_utf8_unicode_ci; | | extern CHARSET_INFO my_charset_utf8_unicode_ci; | |
| extern CHARSET_INFO my_charset_utf8_bin; | | extern CHARSET_INFO my_charset_utf8_bin; | |
| extern CHARSET_INFO my_charset_utf8mb4_bin; | | extern CHARSET_INFO my_charset_utf8mb4_bin; | |
| extern CHARSET_INFO my_charset_utf8mb4_general_ci; | | extern CHARSET_INFO my_charset_utf8mb4_general_ci; | |
| extern CHARSET_INFO my_charset_utf8mb4_unicode_ci; | | extern CHARSET_INFO my_charset_utf8mb4_unicode_ci; | |
| #define MY_UTF8MB3 "utf8" | | #define MY_UTF8MB3 "utf8" | |
| #define MY_UTF8MB4 "utf8mb4" | | #define MY_UTF8MB4 "utf8mb4" | |
| | | | |
| /* Helper functions to handle contraction */ | | /* Helper functions to handle contraction */ | |
| static inline my_bool | | static inline my_bool | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 1 lines changed or deleted | | 1 lines changed or added | |
|---|
|
| my_config.h | | my_config.h | |
|---|
| | | | |
| skipping to change at line 128 | | skipping to change at line 128 | |
|---|
| /* #undef HAVE_TIMESPEC_TS_SEC */ | | /* #undef HAVE_TIMESPEC_TS_SEC */ | |
| | | | |
| /* Readline */ | | /* Readline */ | |
| #define HAVE_HIST_ENTRY 1 | | #define HAVE_HIST_ENTRY 1 | |
| #define USE_LIBEDIT_INTERFACE 1 | | #define USE_LIBEDIT_INTERFACE 1 | |
| /* #undef USE_NEW_READLINE_INTERFACE */ | | /* #undef USE_NEW_READLINE_INTERFACE */ | |
| | | | |
| #define FIONREAD_IN_SYS_IOCTL 1 | | #define FIONREAD_IN_SYS_IOCTL 1 | |
| #define GWINSZ_IN_SYS_IOCTL 1 | | #define GWINSZ_IN_SYS_IOCTL 1 | |
| /* #undef TIOCSTAT_IN_SYS_IOCTL */ | | /* #undef TIOCSTAT_IN_SYS_IOCTL */ | |
|
| | | /* #undef FIONREAD_IN_SYS_FILIO */ | |
| | | | |
| /* Functions we may want to use. */ | | /* Functions we may want to use. */ | |
| /* #undef HAVE_AIOWAIT */ | | /* #undef HAVE_AIOWAIT */ | |
| #define HAVE_ALARM 1 | | #define HAVE_ALARM 1 | |
| #define HAVE_ALLOCA 1 | | #define HAVE_ALLOCA 1 | |
| /* #undef HAVE_BFILL */ | | /* #undef HAVE_BFILL */ | |
| /* #undef HAVE_BMOVE */ | | /* #undef HAVE_BMOVE */ | |
| #define HAVE_BZERO 1 | | #define HAVE_BZERO 1 | |
| #define HAVE_INDEX 1 | | #define HAVE_INDEX 1 | |
| #define HAVE_CHOWN 1 | | #define HAVE_CHOWN 1 | |
| | | | |
| skipping to change at line 160 | | skipping to change at line 161 | |
|---|
| #define HAVE_FESETROUND 1 | | #define HAVE_FESETROUND 1 | |
| #define HAVE_FINITE 1 | | #define HAVE_FINITE 1 | |
| /* #undef HAVE_FP_EXCEPT */ | | /* #undef HAVE_FP_EXCEPT */ | |
| /* #undef HAVE_FPSETMASK */ | | /* #undef HAVE_FPSETMASK */ | |
| #define HAVE_FSEEKO 1 | | #define HAVE_FSEEKO 1 | |
| #define HAVE_FSYNC 1 | | #define HAVE_FSYNC 1 | |
| #define HAVE_FTIME 1 | | #define HAVE_FTIME 1 | |
| #define HAVE_GETADDRINFO 1 | | #define HAVE_GETADDRINFO 1 | |
| #define HAVE_GETCWD 1 | | #define HAVE_GETCWD 1 | |
| #define HAVE_GETHOSTBYADDR_R 1 | | #define HAVE_GETHOSTBYADDR_R 1 | |
|
| #define HAVE_GETHOSTBYNAME_R 1 | | | |
| /* #undef HAVE_GETHRTIME */ | | /* #undef HAVE_GETHRTIME */ | |
| #define HAVE_GETLINE 1 | | #define HAVE_GETLINE 1 | |
| #define HAVE_GETNAMEINFO 1 | | #define HAVE_GETNAMEINFO 1 | |
| #define HAVE_GETPAGESIZE 1 | | #define HAVE_GETPAGESIZE 1 | |
| #define HAVE_GETPASS 1 | | #define HAVE_GETPASS 1 | |
| /* #undef HAVE_GETPASSPHRASE */ | | /* #undef HAVE_GETPASSPHRASE */ | |
| #define HAVE_GETPWNAM 1 | | #define HAVE_GETPWNAM 1 | |
| #define HAVE_GETPWUID 1 | | #define HAVE_GETPWUID 1 | |
| #define HAVE_GETRLIMIT 1 | | #define HAVE_GETRLIMIT 1 | |
| #define HAVE_GETRUSAGE 1 | | #define HAVE_GETRUSAGE 1 | |
| #define HAVE_GETTIMEOFDAY 1 | | #define HAVE_GETTIMEOFDAY 1 | |
| #define HAVE_GETWD 1 | | #define HAVE_GETWD 1 | |
| #define HAVE_GMTIME_R 1 | | #define HAVE_GMTIME_R 1 | |
| /* #undef gmtime_r */ | | /* #undef gmtime_r */ | |
| #define HAVE_INITGROUPS 1 | | #define HAVE_INITGROUPS 1 | |
| /* #undef HAVE_ISSETUGID */ | | /* #undef HAVE_ISSETUGID */ | |
|
| | | #define HAVE_GETUID 1 | |
| | | #define HAVE_GETEUID 1 | |
| | | #define HAVE_GETGID 1 | |
| | | #define HAVE_GETEGID 1 | |
| #define HAVE_ISNAN 1 | | #define HAVE_ISNAN 1 | |
| #define HAVE_ISINF 1 | | #define HAVE_ISINF 1 | |
| #define HAVE_LARGE_PAGE_OPTION 1 | | #define HAVE_LARGE_PAGE_OPTION 1 | |
| #define HAVE_LDIV 1 | | #define HAVE_LDIV 1 | |
| #define HAVE_LRAND48 1 | | #define HAVE_LRAND48 1 | |
| #define HAVE_LOCALTIME_R 1 | | #define HAVE_LOCALTIME_R 1 | |
| #define HAVE_LOG2 1 | | #define HAVE_LOG2 1 | |
| #define HAVE_LONGJMP 1 | | #define HAVE_LONGJMP 1 | |
| #define HAVE_LSTAT 1 | | #define HAVE_LSTAT 1 | |
| #define HAVE_MEMALIGN 1 | | #define HAVE_MEMALIGN 1 | |
| | | | |
| skipping to change at line 447 | | skipping to change at line 451 | |
|---|
| | | | |
| #define HAVE_WEAK_SYMBOL 1 | | #define HAVE_WEAK_SYMBOL 1 | |
| /* #undef HAVE_ABI_CXA_DEMANGLE */ | | /* #undef HAVE_ABI_CXA_DEMANGLE */ | |
| | | | |
| #define HAVE_POSIX_SIGNALS 1 | | #define HAVE_POSIX_SIGNALS 1 | |
| /* #undef HAVE_BSD_SIGNALS */ | | /* #undef HAVE_BSD_SIGNALS */ | |
| /* #undef HAVE_SVR3_SIGNALS */ | | /* #undef HAVE_SVR3_SIGNALS */ | |
| /* #undef HAVE_V7_SIGNALS */ | | /* #undef HAVE_V7_SIGNALS */ | |
| | | | |
| /* #undef HAVE_SOLARIS_STYLE_GETHOST */ | | /* #undef HAVE_SOLARIS_STYLE_GETHOST */ | |
|
| #define HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE 1 | | | |
| /* #undef HAVE_GETHOSTBYNAME_R_RETURN_INT */ | | | |
| | | | |
| /* #undef MY_ATOMIC_MODE_DUMMY */ | | /* #undef MY_ATOMIC_MODE_DUMMY */ | |
| /* #undef MY_ATOMIC_MODE_RWLOCKS */ | | /* #undef MY_ATOMIC_MODE_RWLOCKS */ | |
| #define HAVE_GCC_ATOMIC_BUILTINS 1 | | #define HAVE_GCC_ATOMIC_BUILTINS 1 | |
| /* #undef HAVE_SOLARIS_ATOMIC */ | | /* #undef HAVE_SOLARIS_ATOMIC */ | |
| #define HAVE_DECL_SHM_HUGETLB 1 | | #define HAVE_DECL_SHM_HUGETLB 1 | |
| #define HAVE_LARGE_PAGES 1 | | #define HAVE_LARGE_PAGES 1 | |
| #define HUGETLB_USE_PROC_MEMINFO 1 | | #define HUGETLB_USE_PROC_MEMINFO 1 | |
| /* #undef NO_FCNTL_NONBLOCK */ | | /* #undef NO_FCNTL_NONBLOCK */ | |
| #define NO_ALARM 1 | | #define NO_ALARM 1 | |
| | | | |
| skipping to change at line 509 | | skipping to change at line 511 | |
|---|
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| MySQL features | | MySQL features | |
| */ | | */ | |
| /* #undef ENABLED_LOCAL_INFILE */ | | /* #undef ENABLED_LOCAL_INFILE */ | |
| #define ENABLED_PROFILING 1 | | #define ENABLED_PROFILING 1 | |
| /* #undef EXTRA_DEBUG */ | | /* #undef EXTRA_DEBUG */ | |
| /* #undef BACKUP_TEST */ | | /* #undef BACKUP_TEST */ | |
| /* #undef CYBOZU */ | | /* #undef CYBOZU */ | |
|
| | | /* #undef USE_SYMDIR */ | |
| | | | |
| /* Character sets and collations */ | | /* Character sets and collations */ | |
| #define MYSQL_DEFAULT_CHARSET_NAME "latin1" | | #define MYSQL_DEFAULT_CHARSET_NAME "latin1" | |
| #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" | | #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" | |
| | | | |
| #define USE_MB 1 | | #define USE_MB 1 | |
| #define USE_MB_IDENT 1 | | #define USE_MB_IDENT 1 | |
| /* #undef USE_STRCOLL */ | | /* #undef USE_STRCOLL */ | |
| | | | |
| /* This should mean case insensitive file system */ | | /* This should mean case insensitive file system */ | |
| | | | |
| skipping to change at line 586 | | skipping to change at line 589 | |
|---|
| #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.12" | | #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.13" | |
| #define SHAREDIR "/home/ut/testing/mysql/5.5.12/share" | | #define SHAREDIR "/home/ut/testing/mysql/5.5.13/share" | |
| #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.12" | | #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.13" | |
| #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.12/data" | | #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.13/data" | |
| #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.12" | | #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.13" | |
| #define PLUGINDIR "/home/ut/testing/mysql/5.5.12/lib/plugin" | | #define PLUGINDIR "/home/ut/testing/mysql/5.5.13/lib/plugin" | |
| #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.12/etc" | | #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.13/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.12" | | #define PACKAGE_STRING "MySQL Server 5.5.13" | |
| #define PACKAGE_TARNAME "mysql" | | #define PACKAGE_TARNAME "mysql" | |
|
| #define PACKAGE_VERSION "5.5.12" | | #define PACKAGE_VERSION "5.5.13" | |
| #define VERSION "5.5.12" | | #define VERSION "5.5.13" | |
| #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. 8 change blocks. |
|---|
| 13 lines changed or deleted | | 16 lines changed or added | |
|---|
|
| mysql.h | | mysql.h | |
|---|
| | | | |
| skipping to change at line 569 | | skipping to change at line 569 | |
|---|
| unsigned int param_number; /* For null count and error messages */ | | unsigned int param_number; /* For null count and error messages */ | |
| unsigned int pack_length; /* Internal length for packed data */ | | unsigned int pack_length; /* Internal length for packed data */ | |
| enum enum_field_types buffer_type; /* buffer type */ | | enum enum_field_types buffer_type; /* buffer type */ | |
| my_bool error_value; /* used if error is 0 */ | | my_bool error_value; /* used if error is 0 */ | |
| my_bool is_unsigned; /* set if integer type is unsigned */ | | my_bool is_unsigned; /* set if integer type is unsigned */ | |
| my_bool long_data_used; /* If used with mysql_send_long_data */ | | my_bool long_data_used; /* If used with mysql_send_long_data */ | |
| my_bool is_null_value; /* Used if is_null is 0 */ | | my_bool is_null_value; /* Used if is_null is 0 */ | |
| void *extension; | | void *extension; | |
| } MYSQL_BIND; | | } MYSQL_BIND; | |
| | | | |
|
| | | struct st_mysql_stmt_extension; | |
| | | | |
| /* statement handler */ | | /* statement handler */ | |
| typedef struct st_mysql_stmt | | typedef struct st_mysql_stmt | |
| { | | { | |
| MEM_ROOT mem_root; /* root allocations */ | | MEM_ROOT mem_root; /* root allocations */ | |
| LIST list; /* list to keep track of all stmts *
/ | | LIST list; /* list to keep track of all stmts *
/ | |
| MYSQL *mysql; /* connection handle */ | | MYSQL *mysql; /* connection handle */ | |
| MYSQL_BIND *params; /* input parameters */ | | MYSQL_BIND *params; /* input parameters */ | |
| MYSQL_BIND *bind; /* output parameters */ | | MYSQL_BIND *bind; /* output parameters */ | |
| MYSQL_FIELD *fields; /* result set metadata */ | | MYSQL_FIELD *fields; /* result set metadata */ | |
| MYSQL_DATA result; /* cached result set */ | | MYSQL_DATA result; /* cached result set */ | |
| | | | |
| skipping to change at line 614 | | skipping to change at line 616 | |
|---|
| my_bool send_types_to_server; | | my_bool send_types_to_server; | |
| my_bool bind_param_done; /* input buffers were supplied */ | | my_bool bind_param_done; /* input buffers were supplied */ | |
| unsigned char bind_result_done; /* output buffers were supplied */ | | unsigned char bind_result_done; /* output buffers were supplied */ | |
| /* mysql_stmt_close() had to cancel this result */ | | /* mysql_stmt_close() had to cancel this result */ | |
| my_bool unbuffered_fetch_cancelled; | | my_bool unbuffered_fetch_cancelled; | |
| /* | | /* | |
| Is set to true if we need to calculate field->max_length for | | Is set to true if we need to calculate field->max_length for | |
| metadata fields when doing mysql_stmt_store_result. | | metadata fields when doing mysql_stmt_store_result. | |
| */ | | */ | |
| my_bool update_max_length; | | my_bool update_max_length; | |
|
| void *extension; | | struct st_mysql_stmt_extension *extension; | |
| } MYSQL_STMT; | | } MYSQL_STMT; | |
| | | | |
| enum enum_stmt_attr_type | | enum enum_stmt_attr_type | |
| { | | { | |
| /* | | /* | |
| When doing mysql_stmt_store_result calculate max_length attribute | | When doing mysql_stmt_store_result calculate max_length attribute | |
| of statement metadata. This is to be consistent with the old API, | | of statement metadata. This is to be consistent with the old API, | |
| where this was done automatically. | | where this was done automatically. | |
| In the new API we do that only by request because it slows down | | In the new API we do that only by request because it slows down | |
| mysql_stmt_store_result sufficiently. | | mysql_stmt_store_result sufficiently. | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 1 lines changed or deleted | | 3 lines changed or added | |
|---|
|