my_config.h   my_config.h 
skipping to change at line 214 skipping to change at line 214
#define HAVE_POLL 1 #define HAVE_POLL 1
/* #undef HAVE_PORT_CREATE */ /* #undef HAVE_PORT_CREATE */
#define HAVE_POSIX_FALLOCATE 1 #define HAVE_POSIX_FALLOCATE 1
#define HAVE_POSIX_MEMALIGN 1 #define HAVE_POSIX_MEMALIGN 1
#define HAVE_PREAD 1 #define HAVE_PREAD 1
#define HAVE_PAUSE_INSTRUCTION 1 #define HAVE_PAUSE_INSTRUCTION 1
/* #undef HAVE_FAKE_PAUSE_INSTRUCTION */ /* #undef HAVE_FAKE_PAUSE_INSTRUCTION */
/* #undef HAVE_RDTSCLL */ /* #undef HAVE_RDTSCLL */
/* #undef HAVE_READ_REAL_TIME */ /* #undef HAVE_READ_REAL_TIME */
/* #undef HAVE_PTHREAD_ATTR_CREATE */ /* #undef HAVE_PTHREAD_ATTR_CREATE */
#define HAVE_PTHREAD_ATTR_GETGUARDSIZE 1
#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 #define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
/* #undef HAVE_PTHREAD_ATTR_SETPRIO */ /* #undef HAVE_PTHREAD_ATTR_SETPRIO */
/* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */ /* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */
#define HAVE_PTHREAD_ATTR_SETSCOPE 1 #define HAVE_PTHREAD_ATTR_SETSCOPE 1
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
/* #undef HAVE_PTHREAD_CONDATTR_CREATE */ /* #undef HAVE_PTHREAD_CONDATTR_CREATE */
#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
#define HAVE_PTHREAD_KEY_DELETE 1 #define HAVE_PTHREAD_KEY_DELETE 1
#define HAVE_PTHREAD_KEY_DELETE 1 #define HAVE_PTHREAD_KEY_DELETE 1
/* #undef HAVE_PTHREAD_KILL */ /* #undef HAVE_PTHREAD_KILL */
skipping to change at line 627 skipping to change at line 628
/* #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.13" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.6.14"
#define SHAREDIR "/home/ut/testing/mysql/5.6.13/share" #define SHAREDIR "/home/ut/testing/mysql/5.6.14/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.13" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.14"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.13/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.14/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.13" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.14"
#define PLUGINDIR "/home/ut/testing/mysql/5.6.13/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.6.14/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.13/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.14/etc"
/* #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 13 #define MYSQL_VERSION_PATCH 14
#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.13" #define PACKAGE_STRING "MySQL Server 5.6.14"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.6.13" #define PACKAGE_VERSION "5.6.14"
#define VERSION "5.6.13" #define VERSION "5.6.14"
#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_pthread.h   my_pthread.h 
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2013, 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 793 skipping to change at line 793
extern my_bool my_thread_global_init(void); extern my_bool my_thread_global_init(void);
extern void my_thread_global_reinit(void); extern void my_thread_global_reinit(void);
extern void my_thread_global_end(void); extern void my_thread_global_end(void);
extern my_bool my_thread_init(void); extern my_bool my_thread_init(void);
extern void my_thread_end(void); extern void my_thread_end(void);
extern const char *my_thread_name(void); extern const char *my_thread_name(void);
extern my_thread_id my_thread_dbug_id(void); extern my_thread_id my_thread_dbug_id(void);
extern int pthread_dummy(int); extern int pthread_dummy(int);
#ifndef HAVE_PTHREAD_ATTR_GETGUARDSIZE
static inline int pthread_attr_getguardsize(pthread_attr_t *attr,
size_t *guardsize)
{
*guardsize= 0;
return 0;
}
#endif
/* All thread specific variables are in the following struct */ /* All thread specific variables are in the following struct */
#define THREAD_NAME_SIZE 10 #define THREAD_NAME_SIZE 10
#ifndef DEFAULT_THREAD_STACK #ifndef DEFAULT_THREAD_STACK
#if SIZEOF_CHARP > 4 #if SIZEOF_CHARP > 4
/* /*
MySQL can survive with 32K, but some glibc libraries require > 128K stack MySQL can survive with 32K, but some glibc libraries require > 128K stack
To resolve hostnames. Also recursive stored procedures needs stack. To resolve hostnames. Also recursive stored procedures needs stack.
*/ */
#define DEFAULT_THREAD_STACK (256*1024L) #define DEFAULT_THREAD_STACK (256*1024L)
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added


 mysql_version.h   mysql_version.h 
skipping to change at line 13 skipping to change at line 13
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.13" #define MYSQL_SERVER_VERSION "5.6.14"
#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 50613 #define MYSQL_VERSION_ID 50614
#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


 mysqld_ername.h   mysqld_ername.h 
skipping to change at line 732 skipping to change at line 732
{ "ER_BINLOG_UNSAFE_UPDATE_IGNORE", 1719, "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are igno red. This order cannot be predicted and may differ on master and the slave. " }, { "ER_BINLOG_UNSAFE_UPDATE_IGNORE", 1719, "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are igno red. This order cannot be predicted and may differ on master and the slave. " },
{ "ER_PLUGIN_NO_UNINSTALL", 1720, "Plugin \'%s\' is marked as not dynamical ly uninstallable. You have to stop the server to uninstall it." }, { "ER_PLUGIN_NO_UNINSTALL", 1720, "Plugin \'%s\' is marked as not dynamical ly uninstallable. You have to stop the server to uninstall it." },
{ "ER_PLUGIN_NO_INSTALL", 1721, "Plugin \'%s\' is marked as not dynamically installable. You have to stop the server to install it." }, { "ER_PLUGIN_NO_INSTALL", 1721, "Plugin \'%s\' is marked as not dynamically installable. You have to stop the server to install it." },
{ "ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT", 1722, "Statements writing to a t able with an auto-increment column after selecting from another table are u nsafe because the order in which rows are retrieved determines what (if any ) rows will be written. This order cannot be predicted and may differ on ma ster and the slave." }, { "ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT", 1722, "Statements writing to a t able with an auto-increment column after selecting from another table are u nsafe because the order in which rows are retrieved determines what (if any ) rows will be written. This order cannot be predicted and may differ on ma ster and the slave." },
{ "ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC", 1723, "CREATE TABLE... SELECT.. . on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are i nserted. This order cannot be predicted and may differ on master and the sl ave." }, { "ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC", 1723, "CREATE TABLE... SELECT.. . on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are i nserted. This order cannot be predicted and may differ on master and the sl ave." },
{ "ER_BINLOG_UNSAFE_INSERT_TWO_KEYS", 1724, "INSERT... ON DUPLICATE KEY UPD ATE on a table with more than one UNIQUE KEY is unsafe" }, { "ER_BINLOG_UNSAFE_INSERT_TWO_KEYS", 1724, "INSERT... ON DUPLICATE KEY UPD ATE on a table with more than one UNIQUE KEY is unsafe" },
{ "ER_TABLE_IN_FK_CHECK", 1725, "Table is being used in foreign key check." }, { "ER_TABLE_IN_FK_CHECK", 1725, "Table is being used in foreign key check." },
{ "ER_UNSUPPORTED_ENGINE", 1726, "Storage engine \'%s\' does not support sy stem tables. [%s.%s]" }, { "ER_UNSUPPORTED_ENGINE", 1726, "Storage engine \'%s\' does not support sy stem tables. [%s.%s]" },
{ "ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST", 1727, "INSERT into autoincrement fi eld which is not the first part in the composed primary key is unsafe." }, { "ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST", 1727, "INSERT into autoincrement fi eld which is not the first part in the composed primary key is unsafe." },
{ "ER_CANNOT_LOAD_FROM_TABLE_V2", 1728, "Cannot load from %s.%s. The table is probably corrupted" }, { "ER_CANNOT_LOAD_FROM_TABLE_V2", 1728, "Cannot load from %s.%s. The table is probably corrupted" },
{ "ER_MASTER_DELAY_VALUE_OUT_OF_RANGE", 1729, "The requested value %u for t he master delay exceeds the maximum %u" }, { "ER_MASTER_DELAY_VALUE_OUT_OF_RANGE", 1729, "The requested value %s for t he master delay exceeds the maximum %u" },
{ "ER_ONLY_FD_AND_RBR_EVENTS_ALLOWED_IN_BINLOG_STATEMENT", 1730, "Only Form at_description_log_event and row events are allowed in BINLOG statements (b ut %s was provided)" }, { "ER_ONLY_FD_AND_RBR_EVENTS_ALLOWED_IN_BINLOG_STATEMENT", 1730, "Only Form at_description_log_event and row events are allowed in BINLOG statements (b ut %s was provided)" },
{ "ER_PARTITION_EXCHANGE_DIFFERENT_OPTION", 1731, "Non matching attribute \ '%-.64s\' between partition and table" }, { "ER_PARTITION_EXCHANGE_DIFFERENT_OPTION", 1731, "Non matching attribute \ '%-.64s\' between partition and table" },
{ "ER_PARTITION_EXCHANGE_PART_TABLE", 1732, "Table to exchange with partiti on is partitioned: \'%-.64s\'" }, { "ER_PARTITION_EXCHANGE_PART_TABLE", 1732, "Table to exchange with partiti on is partitioned: \'%-.64s\'" },
{ "ER_PARTITION_EXCHANGE_TEMP_TABLE", 1733, "Table to exchange with partiti on is temporary: \'%-.64s\'" }, { "ER_PARTITION_EXCHANGE_TEMP_TABLE", 1733, "Table to exchange with partiti on is temporary: \'%-.64s\'" },
{ "ER_PARTITION_INSTEAD_OF_SUBPARTITION", 1734, "Subpartitioned table, use subpartition instead of partition" }, { "ER_PARTITION_INSTEAD_OF_SUBPARTITION", 1734, "Subpartitioned table, use subpartition instead of partition" },
{ "ER_UNKNOWN_PARTITION", 1735, "Unknown partition \'%-.64s\' in table \'%- .64s\'" }, { "ER_UNKNOWN_PARTITION", 1735, "Unknown partition \'%-.64s\' in table \'%- .64s\'" },
{ "ER_TABLES_DIFFERENT_METADATA", 1736, "Tables have different definitions" }, { "ER_TABLES_DIFFERENT_METADATA", 1736, "Tables have different definitions" },
{ "ER_ROW_DOES_NOT_MATCH_PARTITION", 1737, "Found a row that does not match the partition" }, { "ER_ROW_DOES_NOT_MATCH_PARTITION", 1737, "Found a row that does not match the partition" },
{ "ER_BINLOG_CACHE_SIZE_GREATER_THAN_MAX", 1738, "Option binlog_cache_size (%lu) is greater than max_binlog_cache_size (%lu); setting binlog_cache_siz e equal to max_binlog_cache_size." }, { "ER_BINLOG_CACHE_SIZE_GREATER_THAN_MAX", 1738, "Option binlog_cache_size (%lu) is greater than max_binlog_cache_size (%lu); setting binlog_cache_siz e equal to max_binlog_cache_size." },
{ "ER_WARN_INDEX_NOT_APPLICABLE", 1739, "Cannot use %-.64s access on index \'%-.64s\' due to type or collation conversion on field \'%-.64s\'" }, { "ER_WARN_INDEX_NOT_APPLICABLE", 1739, "Cannot use %-.64s access on index \'%-.64s\' due to type or collation conversion on field \'%-.64s\'" },
skipping to change at line 880 skipping to change at line 880
{ "ER_WARN_PURGE_LOG_IN_USE", 1867, "file %s was not purged because it was being read by %d thread(s), purged only %d out of %d files." }, { "ER_WARN_PURGE_LOG_IN_USE", 1867, "file %s was not purged because it was being read by %d thread(s), purged only %d out of %d files." },
{ "ER_WARN_PURGE_LOG_IS_ACTIVE", 1868, "file %s was not purged because it i s the active log file." }, { "ER_WARN_PURGE_LOG_IS_ACTIVE", 1868, "file %s was not purged because it i s the active log file." },
{ "ER_AUTO_INCREMENT_CONFLICT", 1869, "Auto-increment value in UPDATE confl icts with internally generated values" }, { "ER_AUTO_INCREMENT_CONFLICT", 1869, "Auto-increment value in UPDATE confl icts with internally generated values" },
{ "WARN_ON_BLOCKHOLE_IN_RBR", 1870, "Row events are not logged for %s state ments that modify BLACKHOLE tables in row format. Table(s): \'%-.192s\'" }, { "WARN_ON_BLOCKHOLE_IN_RBR", 1870, "Row events are not logged for %s state ments that modify BLACKHOLE tables in row format. Table(s): \'%-.192s\'" },
{ "ER_SLAVE_MI_INIT_REPOSITORY", 1871, "Slave failed to initialize master i nfo structure from the repository" }, { "ER_SLAVE_MI_INIT_REPOSITORY", 1871, "Slave failed to initialize master i nfo structure from the repository" },
{ "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." },
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysqld_error.h   mysqld_error.h 
skipping to change at line 881 skipping to change at line 881
#define ER_WARN_PURGE_LOG_IN_USE 1867 #define ER_WARN_PURGE_LOG_IN_USE 1867
#define ER_WARN_PURGE_LOG_IS_ACTIVE 1868 #define ER_WARN_PURGE_LOG_IS_ACTIVE 1868
#define ER_AUTO_INCREMENT_CONFLICT 1869 #define ER_AUTO_INCREMENT_CONFLICT 1869
#define WARN_ON_BLOCKHOLE_IN_RBR 1870 #define WARN_ON_BLOCKHOLE_IN_RBR 1870
#define ER_SLAVE_MI_INIT_REPOSITORY 1871 #define ER_SLAVE_MI_INIT_REPOSITORY 1871
#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_ERROR_LAST 1876 #define ER_TABLE_CORRUPT 1877
#define ER_ERROR_LAST 1877
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 plugin_audit.h   plugin_audit.h 
skipping to change at line 28 skipping to change at line 28
#define _my_audit_h #define _my_audit_h
/************************************************************************* /*************************************************************************
API for Audit plugin. (MYSQL_AUDIT_PLUGIN) API for Audit plugin. (MYSQL_AUDIT_PLUGIN)
*/ */
#include "plugin.h" #include "plugin.h"
#define MYSQL_AUDIT_CLASS_MASK_SIZE 1 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
#define MYSQL_AUDIT_INTERFACE_VERSION 0x0300 #define MYSQL_AUDIT_INTERFACE_VERSION 0x0301
/************************************************************************* /*************************************************************************
AUDIT CLASS : GENERAL AUDIT CLASS : GENERAL
LOG events occurs before emitting to the general query log. LOG events occurs before emitting to the general query log.
ERROR events occur before transmitting errors to the user. ERROR events occur before transmitting errors to the user.
RESULT events occur after transmitting a resultset to the user. RESULT events occur after transmitting a resultset to the user.
STATUS events occur after transmitting a resultset or errors STATUS events occur after transmitting a resultset or errors
to the user. to the user.
*/ */
skipping to change at line 61 skipping to change at line 61
unsigned long general_thread_id; unsigned long general_thread_id;
const char *general_user; const char *general_user;
unsigned int general_user_length; unsigned int general_user_length;
const char *general_command; const char *general_command;
unsigned int general_command_length; unsigned int general_command_length;
const char *general_query; const char *general_query;
unsigned int general_query_length; unsigned int general_query_length;
struct charset_info_st *general_charset; struct charset_info_st *general_charset;
unsigned long long general_time; unsigned long long general_time;
unsigned long long general_rows; unsigned long long general_rows;
MYSQL_LEX_STRING general_host;
MYSQL_LEX_STRING general_sql_command;
MYSQL_LEX_STRING general_external_user;
MYSQL_LEX_STRING general_ip;
}; };
/* /*
AUDIT CLASS : CONNECTION AUDIT CLASS : CONNECTION
CONNECT occurs after authentication phase is completed. CONNECT occurs after authentication phase is completed.
DISCONNECT occurs after connection is terminated. DISCONNECT occurs after connection is terminated.
CHANGE_USER occurs after COM_CHANGE_USER RPC is completed. CHANGE_USER occurs after COM_CHANGE_USER RPC is completed.
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 plugin_audit.h.pp   plugin_audit.h.pp 
skipping to change at line 264 skipping to change at line 264
unsigned long general_thread_id; unsigned long general_thread_id;
const char *general_user; const char *general_user;
unsigned int general_user_length; unsigned int general_user_length;
const char *general_command; const char *general_command;
unsigned int general_command_length; unsigned int general_command_length;
const char *general_query; const char *general_query;
unsigned int general_query_length; unsigned int general_query_length;
struct charset_info_st *general_charset; struct charset_info_st *general_charset;
unsigned long long general_time; unsigned long long general_time;
unsigned long long general_rows; unsigned long long general_rows;
MYSQL_LEX_STRING general_host;
MYSQL_LEX_STRING general_sql_command;
MYSQL_LEX_STRING general_external_user;
MYSQL_LEX_STRING general_ip;
}; };
struct mysql_event_connection struct mysql_event_connection
{ {
unsigned int event_subclass; unsigned int event_subclass;
int status; int status;
unsigned long thread_id; unsigned long thread_id;
const char *user; const char *user;
unsigned int user_length; unsigned int user_length;
const char *priv_user; const char *priv_user;
unsigned int priv_user_length; unsigned int priv_user_length;
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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/