errmsg.h   errmsg.h 
#ifndef ERRMSG_INCLUDED #ifndef ERRMSG_INCLUDED
#define ERRMSG_INCLUDED #define ERRMSG_INCLUDED
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 m_ctype.h   m_ctype.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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 m_string.h   m_string.h 
/* /*
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reser ved. Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 my_config.h   my_config.h 
/* Copyright (c) 2009, 2011, 2012 Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2009, 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 494 skipping to change at line 494
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#define TIME_WITH_SYS_TIME 1 #define TIME_WITH_SYS_TIME 1
#define STACK_DIRECTION -1 #define STACK_DIRECTION -1
#define SYSTEM_TYPE "Linux" #define SYSTEM_TYPE "Linux"
#define MACHINE_TYPE "i686" #define MACHINE_TYPE "i686"
/* #undef HAVE_DTRACE */ /* #undef HAVE_DTRACE */
#define SIGNAL_WITH_VIO_CLOSE 1 #define SIGNAL_WITH_VIO_SHUTDOWN 1
/* Windows stuff, mostly functions, that have Posix analogs but named diffe rently */ /* Windows stuff, mostly functions, that have Posix analogs but named diffe rently */
/* #undef S_IROTH */ /* #undef S_IROTH */
/* #undef S_IFIFO */ /* #undef S_IFIFO */
/* #undef IPPROTO_IPV6 */ /* #undef IPPROTO_IPV6 */
/* #undef IPV6_V6ONLY */ /* #undef IPV6_V6ONLY */
/* #undef sigset_t */ /* #undef sigset_t */
/* #undef mode_t */ /* #undef mode_t */
/* #undef SIGQUIT */ /* #undef SIGQUIT */
/* #undef SIGPIPE */ /* #undef SIGPIPE */
skipping to change at line 617 skipping to change at line 617
*/ */
#define HAVE_SPATIAL 1 #define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1 #define HAVE_RTREE_KEYS 1
#define HAVE_QUERY_CACHE 1 #define HAVE_QUERY_CACHE 1
#define BIG_TABLES 1 #define BIG_TABLES 1
/* /*
Important storage engines (those that really need define Important storage engines (those that really need define
WITH_<ENGINE>_STORAGE_ENGINE for the whole server) WITH_<ENGINE>_STORAGE_ENGINE for the whole server)
*/ */
#define WITH_MYISAM_STORAGE_ENGINE 1 /* #undef WITH_MYISAM_STORAGE_ENGINE */
#define WITH_MYISAMMRG_STORAGE_ENGINE 1 /* #undef WITH_MYISAMMRG_STORAGE_ENGINE */
#define WITH_HEAP_STORAGE_ENGINE 1 /* #undef WITH_HEAP_STORAGE_ENGINE */
#define WITH_CSV_STORAGE_ENGINE 1 /* #undef WITH_CSV_STORAGE_ENGINE */
#define WITH_PARTITION_STORAGE_ENGINE 1 #define WITH_PARTITION_STORAGE_ENGINE 1
#define WITH_PERFSCHEMA_STORAGE_ENGINE 1 /* #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.10" #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.6.11"
#define SHAREDIR "/home/ut/testing/mysql/5.6.10/share" #define SHAREDIR "/home/ut/testing/mysql/5.6.11/share"
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.10" #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.11"
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.10/data" #define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.11/data"
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.10" #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.11"
#define PLUGINDIR "/home/ut/testing/mysql/5.6.10/lib/plugin" #define PLUGINDIR "/home/ut/testing/mysql/5.6.11/lib/plugin"
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.10/etc" #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.11/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 10 #define MYSQL_VERSION_PATCH 11
#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.10" #define PACKAGE_STRING "MySQL Server 5.6.11"
#define PACKAGE_TARNAME "mysql" #define PACKAGE_TARNAME "mysql"
#define PACKAGE_VERSION "5.6.10" #define PACKAGE_VERSION "5.6.11"
#define VERSION "5.6.10" #define VERSION "5.6.11"
#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. 8 change blocks. 
18 lines changed or deleted 18 lines changed or added


 my_dbug.h   my_dbug.h 
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 my_pthread.h   my_pthread.h 
/* Copyright (c) 2000, 2011, 2012 Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 my_sys.h   my_sys.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 249 skipping to change at line 249
#else #else
extern int errno; /* declare errno */ extern int errno; /* declare errno */
#endif #endif
#endif /* #ifndef errno */ #endif /* #ifndef errno */
extern char *home_dir; /* Home directory for user */ extern char *home_dir; /* Home directory for user */
extern const char *my_progname; /* program-name (printed in errors) */ extern const char *my_progname; /* program-name (printed in errors) */
extern char curr_dir[]; /* Current directory for user */ extern char curr_dir[]; /* Current directory for user */
extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags) ; extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags) ;
extern void (*fatal_error_handler_hook)(uint my_err, const char *str, extern void (*fatal_error_handler_hook)(uint my_err, const char *str,
myf MyFlags); myf MyFlags);
extern void(*sql_print_warning_hook)(const char *format,...);
extern uint my_file_limit; extern uint my_file_limit;
extern ulong my_thread_stack_size; extern ulong my_thread_stack_size;
extern void (*proc_info_hook)(void *, const PSI_stage_info *, PSI_stage_inf o *, extern void (*proc_info_hook)(void *, const PSI_stage_info *, PSI_stage_inf o *,
const char *, const char *, const unsigned in t); const char *, const char *, const unsigned in t);
#ifdef HAVE_LARGE_PAGES #ifdef HAVE_LARGE_PAGES
extern my_bool my_use_large_pages; extern my_bool my_use_large_pages;
extern uint my_large_page_size; extern uint my_large_page_size;
#endif #endif
skipping to change at line 676 skipping to change at line 677
extern char *my_strerror(char *buf, size_t len, int errnum); extern char *my_strerror(char *buf, size_t len, int errnum);
extern const char *my_get_err_msg(int nr); extern const char *my_get_err_msg(int nr);
extern void my_error(int nr,myf MyFlags, ...); extern void my_error(int nr,myf MyFlags, ...);
extern void my_printf_error(uint my_err, const char *format, extern void my_printf_error(uint my_err, const char *format,
myf MyFlags, ...) myf MyFlags, ...)
ATTRIBUTE_FORMAT(printf, 2, 4); ATTRIBUTE_FORMAT(printf, 2, 4);
extern void my_printv_error(uint error, const char *format, myf MyFlags, extern void my_printv_error(uint error, const char *format, myf MyFlags,
va_list ap); va_list ap);
extern int my_error_register(const char** (*get_errmsgs) (), extern int my_error_register(const char** (*get_errmsgs) (),
int first, int last); int first, int last);
extern void my_printf_warning (const char * format, ...);
extern const char **my_error_unregister(int first, int last); extern const char **my_error_unregister(int first, int last);
extern void my_message(uint my_err, const char *str,myf MyFlags); extern void my_message(uint my_err, const char *str,myf MyFlags);
extern void my_message_stderr(uint my_err, const char *str, myf MyFlags); extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);
extern my_bool my_init(void); extern my_bool my_init(void);
extern void my_end(int infoflag); extern void my_end(int infoflag);
extern int my_redel(const char *from, const char *to, int MyFlags); extern int my_redel(const char *from, const char *to, int MyFlags);
extern int my_copystat(const char *from, const char *to, int MyFlags); extern int my_copystat(const char *from, const char *to, int MyFlags);
extern char * my_filename(File fd); extern char * my_filename(File fd);
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 my_xml.h   my_xml.h 
/* Copyright (C) 2000 MySQL AB /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql.h   mysql.h 
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql_file.h   mysql_file.h 
/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2008, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql_idle.h   mysql_idle.h 
/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2011, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql_stage.h   mysql_stage.h 
/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2010, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mysql_version.h   mysql_version.h 
/* Copyright Abandoned 1996, 1999, 2001 MySQL AB /* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
Use is subject to license terms
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.10" #define MYSQL_SERVER_VERSION "5.6.11"
#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 50610 #define MYSQL_VERSION_ID 50611
#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. 
3 lines changed or deleted 4 lines changed or added


 mysqld_ername.h   mysqld_ername.h 
skipping to change at line 780 skipping to change at line 780
{ "ER_GTID_NEXT_IS_NOT_IN_GTID_NEXT_LIST", 1767, "The system variable @@SES SION.GTID_NEXT has the value %.200s, which is not listed in @@SESSION.GTID_ NEXT_LIST." }, { "ER_GTID_NEXT_IS_NOT_IN_GTID_NEXT_LIST", 1767, "The system variable @@SES SION.GTID_NEXT has the value %.200s, which is not listed in @@SESSION.GTID_ NEXT_LIST." },
{ "ER_CANT_CHANGE_GTID_NEXT_IN_TRANSACTION_WHEN_GTID_NEXT_LIST_IS_NULL", 17 68, "When @@SESSION.GTID_NEXT_LIST == NULL, the system variable @@SESSION.G TID_NEXT cannot change inside a transaction." }, { "ER_CANT_CHANGE_GTID_NEXT_IN_TRANSACTION_WHEN_GTID_NEXT_LIST_IS_NULL", 17 68, "When @@SESSION.GTID_NEXT_LIST == NULL, the system variable @@SESSION.G TID_NEXT cannot change inside a transaction." },
{ "ER_SET_STATEMENT_CANNOT_INVOKE_FUNCTION", 1769, "The statement \'SET %.2 00s\' cannot invoke a stored function." }, { "ER_SET_STATEMENT_CANNOT_INVOKE_FUNCTION", 1769, "The statement \'SET %.2 00s\' cannot invoke a stored function." },
{ "ER_GTID_NEXT_CANT_BE_AUTOMATIC_IF_GTID_NEXT_LIST_IS_NON_NULL", 1770, "Th e system variable @@SESSION.GTID_NEXT cannot be \'AUTOMATIC\' when @@SESSIO N.GTID_NEXT_LIST is non-NULL." }, { "ER_GTID_NEXT_CANT_BE_AUTOMATIC_IF_GTID_NEXT_LIST_IS_NON_NULL", 1770, "Th e system variable @@SESSION.GTID_NEXT cannot be \'AUTOMATIC\' when @@SESSIO N.GTID_NEXT_LIST is non-NULL." },
{ "ER_SKIPPING_LOGGED_TRANSACTION", 1771, "Skipping transaction %.200s beca use it has already been executed and logged." }, { "ER_SKIPPING_LOGGED_TRANSACTION", 1771, "Skipping transaction %.200s beca use it has already been executed and logged." },
{ "ER_MALFORMED_GTID_SET_SPECIFICATION", 1772, "Malformed GTID set specific ation \'%.200s\'." }, { "ER_MALFORMED_GTID_SET_SPECIFICATION", 1772, "Malformed GTID set specific ation \'%.200s\'." },
{ "ER_MALFORMED_GTID_SET_ENCODING", 1773, "Malformed GTID set encoding." }, { "ER_MALFORMED_GTID_SET_ENCODING", 1773, "Malformed GTID set encoding." },
{ "ER_MALFORMED_GTID_SPECIFICATION", 1774, "Malformed GTID specification \' %.200s\'." }, { "ER_MALFORMED_GTID_SPECIFICATION", 1774, "Malformed GTID specification \' %.200s\'." },
{ "ER_GNO_EXHAUSTED", 1775, "Impossible to generate Global Transaction Iden tifier: the integer component reached the maximal value. Restart the server with a new server_uuid." }, { "ER_GNO_EXHAUSTED", 1775, "Impossible to generate Global Transaction Iden tifier: the integer component reached the maximal value. Restart the server with a new server_uuid." },
{ "ER_BAD_SLAVE_AUTO_POSITION", 1776, "Parameters MASTER_LOG_FILE, MASTER_L OG_POS, RELAY_LOG_FILE and RELAY_LOG_POS cannot be set when MASTER_AUTO_POS ITION is active." }, { "ER_BAD_SLAVE_AUTO_POSITION", 1776, "Parameters MASTER_LOG_FILE, MASTER_L OG_POS, RELAY_LOG_FILE and RELAY_LOG_POS cannot be set when MASTER_AUTO_POS ITION is active." },
{ "ER_AUTO_POSITION_REQUIRES_GTID_MODE_ON", 1777, "CHANGE MASTER TO MASTER_ { "ER_AUTO_POSITION_REQUIRES_GTID_MODE_ON", 1777, "CHANGE MASTER TO MASTER_
AUTO_POSITION = 1 can only be executed when GTID_MODE = ON." }, AUTO_POSITION = 1 can only be executed when @@GLOBAL.GTID_MODE = ON." },
{ "ER_CANT_DO_IMPLICIT_COMMIT_IN_TRX_WHEN_GTID_NEXT_IS_SET", 1778, "Cannot { "ER_CANT_DO_IMPLICIT_COMMIT_IN_TRX_WHEN_GTID_NEXT_IS_SET", 1778, "Cannot
execute statements with implicit commit inside a transaction when GTID_NEXT execute statements with implicit commit inside a transaction when @@SESSION
!= AUTOMATIC or GTID_NEXT_LIST != NULL." }, .GTID_NEXT != AUTOMATIC or @@SESSION.GTID_NEXT_LIST != NULL." },
{ "ER_GTID_MODE_2_OR_3_REQUIRES_ENFORCE_GTID_CONSISTENCY_ON", 1779, "GTID_M { "ER_GTID_MODE_2_OR_3_REQUIRES_ENFORCE_GTID_CONSISTENCY_ON", 1779, "@@GLOB
ODE = ON or GTID_MODE = UPGRADE_STEP_2 requires ENFORCE_GTID_CONSISTENCY = AL.GTID_MODE = ON or UPGRADE_STEP_2 requires @@GLOBAL.ENFORCE_GTID_CONSISTE
1." }, NCY = 1." },
{ "ER_GTID_MODE_REQUIRES_BINLOG", 1780, "GTID_MODE = ON or UPGRADE_STEP_1 o { "ER_GTID_MODE_REQUIRES_BINLOG", 1780, "@@GLOBAL.GTID_MODE = ON or UPGRADE
r UPGRADE_STEP_2 requires --log-bin and --log-slave-updates." }, _STEP_1 or UPGRADE_STEP_2 requires --log-bin and --log-slave-updates." },
{ "ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF", 1781, "GTID_NEXT c { "ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF", 1781, "@@SESSION.G
annot be set to UUID:NUMBER when GTID_MODE = OFF." }, TID_NEXT cannot be set to UUID:NUMBER when @@GLOBAL.GTID_MODE = OFF." },
{ "ER_CANT_SET_GTID_NEXT_TO_ANONYMOUS_WHEN_GTID_MODE_IS_ON", 1782, "GTID_NE { "ER_CANT_SET_GTID_NEXT_TO_ANONYMOUS_WHEN_GTID_MODE_IS_ON", 1782, "@@SESSI
XT cannot be set to ANONYMOUS when GTID_MODE = ON." }, ON.GTID_NEXT cannot be set to ANONYMOUS when @@GLOBAL.GTID_MODE = ON." },
{ "ER_CANT_SET_GTID_NEXT_LIST_TO_NON_NULL_WHEN_GTID_MODE_IS_OFF", 1783, "GT { "ER_CANT_SET_GTID_NEXT_LIST_TO_NON_NULL_WHEN_GTID_MODE_IS_OFF", 1783, "@@
ID_NEXT_LIST cannot be set to a non-NULL value when GTID_MODE = OFF." }, SESSION.GTID_NEXT_LIST cannot be set to a non-NULL value when @@GLOBAL.GTID
{ "ER_FOUND_GTID_EVENT_WHEN_GTID_MODE_IS_OFF", 1784, "Found a Gtid_log_even _MODE = OFF." },
t or Previous_gtids_log_event when GTID_MODE = OFF." }, { "ER_FOUND_GTID_EVENT_WHEN_GTID_MODE_IS_OFF", 1784, "Found a Gtid_log_even
{ "ER_GTID_UNSAFE_NON_TRANSACTIONAL_TABLE", 1785, "When ENFORCE_GTID_CONSIS t or Previous_gtids_log_event when @@GLOBAL.GTID_MODE = OFF." },
TENCY = 1, updates to non-transactional tables can only be done in either a { "ER_GTID_UNSAFE_NON_TRANSACTIONAL_TABLE", 1785, "When @@GLOBAL.ENFORCE_GT
utocommitted statements or single-statement transactions, and never in the ID_CONSISTENCY = 1, updates to non-transactional tables can only be done in
same statement as updates to transactional tables." }, either autocommitted statements or single-statement transactions, and neve
{ "ER_GTID_UNSAFE_CREATE_SELECT", 1786, "CREATE TABLE ... SELECT is forbidd r in the same statement as updates to transactional tables." },
en when ENFORCE_GTID_CONSISTENCY = 1." }, { "ER_GTID_UNSAFE_CREATE_SELECT", 1786, "CREATE TABLE ... SELECT is forbidd
{ "ER_GTID_UNSAFE_CREATE_DROP_TEMPORARY_TABLE_IN_TRANSACTION", 1787, "When en when @@GLOBAL.ENFORCE_GTID_CONSISTENCY = 1." },
ENFORCE_GTID_CONSISTENCY = 1, the statements CREATE TEMPORARY TABLE and DRO { "ER_GTID_UNSAFE_CREATE_DROP_TEMPORARY_TABLE_IN_TRANSACTION", 1787, "When
P TEMPORARY TABLE can be executed in a non-transactional context only, and @@GLOBAL.ENFORCE_GTID_CONSISTENCY = 1, the statements CREATE TEMPORARY TABL
require that AUTOCOMMIT = 1." }, E and DROP TEMPORARY TABLE can be executed in a non-transactional context o
{ "ER_GTID_MODE_CAN_ONLY_CHANGE_ONE_STEP_AT_A_TIME", 1788, "The value of GT nly, and require that AUTOCOMMIT = 1." },
ID_MODE can only change one step at a time: OFF <-> UPGRADE_STEP_1 <-> UPGR { "ER_GTID_MODE_CAN_ONLY_CHANGE_ONE_STEP_AT_A_TIME", 1788, "The value of @@
ADE_STEP_2 <-> ON. Also note that this value must be stepped up or down sim GLOBAL.GTID_MODE can only change one step at a time: OFF <-> UPGRADE_STEP_1
ultaneously on all servers; see the Manual for instructions." }, <-> UPGRADE_STEP_2 <-> ON. Also note that this value must be stepped up or
down simultaneously on all servers; see the Manual for instructions." },
{ "ER_MASTER_HAS_PURGED_REQUIRED_GTIDS", 1789, "The slave is connecting usi ng CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged bin ary logs containing GTIDs that the slave requires." }, { "ER_MASTER_HAS_PURGED_REQUIRED_GTIDS", 1789, "The slave is connecting usi ng CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged bin ary logs containing GTIDs that the slave requires." },
{ "ER_CANT_SET_GTID_NEXT_WHEN_OWNING_GTID", 1790, "GTID_NEXT cannot be chan ged by a client that owns a GTID. The client owns %s. Ownership is released on COMMIT or ROLLBACK." }, { "ER_CANT_SET_GTID_NEXT_WHEN_OWNING_GTID", 1790, "@@SESSION.GTID_NEXT cann ot be changed by a client that owns a GTID. The client owns %s. Ownership i s released on COMMIT or ROLLBACK." },
{ "ER_UNKNOWN_EXPLAIN_FORMAT", 1791, "Unknown EXPLAIN format name: \'%s\'" }, { "ER_UNKNOWN_EXPLAIN_FORMAT", 1791, "Unknown EXPLAIN format name: \'%s\'" },
{ "ER_CANT_EXECUTE_IN_READ_ONLY_TRANSACTION", 1792, "Cannot execute stateme nt in a READ ONLY transaction." }, { "ER_CANT_EXECUTE_IN_READ_ONLY_TRANSACTION", 1792, "Cannot execute stateme nt in a READ ONLY transaction." },
{ "ER_TOO_LONG_TABLE_PARTITION_COMMENT", 1793, "Comment for table partition \'%-.64s\' is too long (max = %lu)" }, { "ER_TOO_LONG_TABLE_PARTITION_COMMENT", 1793, "Comment for table partition \'%-.64s\' is too long (max = %lu)" },
{ "ER_SLAVE_CONFIGURATION", 1794, "Slave is not configured or failed to ini tialize properly. You must at least set --server-id to enable either a mast er or a slave. Additional error messages can be found in the MySQL error lo g." }, { "ER_SLAVE_CONFIGURATION", 1794, "Slave is not configured or failed to ini tialize properly. You must at least set --server-id to enable either a mast er or a slave. Additional error messages can be found in the MySQL error lo g." },
{ "ER_INNODB_FT_LIMIT", 1795, "InnoDB presently supports one FULLTEXT index creation at a time" }, { "ER_INNODB_FT_LIMIT", 1795, "InnoDB presently supports one FULLTEXT index creation at a time" },
{ "ER_INNODB_NO_FT_TEMP_TABLE", 1796, "Cannot create FULLTEXT index on temp orary InnoDB table" }, { "ER_INNODB_NO_FT_TEMP_TABLE", 1796, "Cannot create FULLTEXT index on temp orary InnoDB table" },
{ "ER_INNODB_FT_WRONG_DOCID_COLUMN", 1797, "Column \'%-.192s\' is of wrong type for an InnoDB FULLTEXT index" }, { "ER_INNODB_FT_WRONG_DOCID_COLUMN", 1797, "Column \'%-.192s\' is of wrong type for an InnoDB FULLTEXT index" },
{ "ER_INNODB_FT_WRONG_DOCID_INDEX", 1798, "Index \'%-.192s\' is of wrong ty pe for an InnoDB FULLTEXT index" }, { "ER_INNODB_FT_WRONG_DOCID_INDEX", 1798, "Index \'%-.192s\' is of wrong ty pe for an InnoDB FULLTEXT index" },
{ "ER_INNODB_ONLINE_LOG_TOO_BIG", 1799, "Creating index \'%-.192s\' require d more than \'innodb_online_alter_log_max_size\' bytes of modification log. Please try again." }, { "ER_INNODB_ONLINE_LOG_TOO_BIG", 1799, "Creating index \'%-.192s\' require d more than \'innodb_online_alter_log_max_size\' bytes of modification log. Please try again." },
{ "ER_UNKNOWN_ALTER_ALGORITHM", 1800, "Unknown ALGORITHM \'%s\'" }, { "ER_UNKNOWN_ALTER_ALGORITHM", 1800, "Unknown ALGORITHM \'%s\'" },
skipping to change at line 840 skipping to change at line 840
{ "ER_PASSWORD_FORMAT", 1827, "The password hash doesn\'t have the expected format. Check if the correct password algorithm is being used with the PAS SWORD() function." }, { "ER_PASSWORD_FORMAT", 1827, "The password hash doesn\'t have the expected format. Check if the correct password algorithm is being used with the PAS SWORD() function." },
{ "ER_FK_COLUMN_CANNOT_DROP", 1828, "Cannot drop column \'%-.192s\': needed in a foreign key constraint \'%-.192s\'" }, { "ER_FK_COLUMN_CANNOT_DROP", 1828, "Cannot drop column \'%-.192s\': needed in a foreign key constraint \'%-.192s\'" },
{ "ER_FK_COLUMN_CANNOT_DROP_CHILD", 1829, "Cannot drop column \'%-.192s\': needed in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" }, { "ER_FK_COLUMN_CANNOT_DROP_CHILD", 1829, "Cannot drop column \'%-.192s\': needed in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" },
{ "ER_FK_COLUMN_NOT_NULL", 1830, "Column \'%-.192s\' cannot be NOT NULL: ne eded in a foreign key constraint \'%-.192s\' SET NULL" }, { "ER_FK_COLUMN_NOT_NULL", 1830, "Column \'%-.192s\' cannot be NOT NULL: ne eded in a foreign key constraint \'%-.192s\' SET NULL" },
{ "ER_DUP_INDEX", 1831, "Duplicate index \'%-.64s\' defined on the table \' %-.64s.%-.64s\'. This is deprecated and will be disallowed in a future rele ase." }, { "ER_DUP_INDEX", 1831, "Duplicate index \'%-.64s\' defined on the table \' %-.64s.%-.64s\'. This is deprecated and will be disallowed in a future rele ase." },
{ "ER_FK_COLUMN_CANNOT_CHANGE", 1832, "Cannot change column \'%-.192s\': us ed in a foreign key constraint \'%-.192s\'" }, { "ER_FK_COLUMN_CANNOT_CHANGE", 1832, "Cannot change column \'%-.192s\': us ed in a foreign key constraint \'%-.192s\'" },
{ "ER_FK_COLUMN_CANNOT_CHANGE_CHILD", 1833, "Cannot change column \'%-.192s \': used in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" }, { "ER_FK_COLUMN_CANNOT_CHANGE_CHILD", 1833, "Cannot change column \'%-.192s \': used in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" },
{ "ER_FK_CANNOT_DELETE_PARENT", 1834, "Cannot delete rows from table which is parent in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" }, { "ER_FK_CANNOT_DELETE_PARENT", 1834, "Cannot delete rows from table which is parent in a foreign key constraint \'%-.192s\' of table \'%-.192s\'" },
{ "ER_MALFORMED_PACKET", 1835, "Malformed communication packet." }, { "ER_MALFORMED_PACKET", 1835, "Malformed communication packet." },
{ "ER_READ_ONLY_MODE", 1836, "Running in read-only mode" }, { "ER_READ_ONLY_MODE", 1836, "Running in read-only mode" },
{ "ER_GTID_NEXT_TYPE_UNDEFINED_GROUP", 1837, "When GTID_NEXT is set to a GT ID, you must explicitly set it again after a COMMIT or ROLLBACK. If you see this error message in the slave SQL thread, it means that a table in the c urrent transaction is transactional on the master and non-transactional on the slave. In a client connection, it means that you executed SET GTID_NEXT before a transaction and forgot to set GTID_NEXT to a different identifier or to \'AUTOMATIC\' after COMMIT or ROLLBACK. Current GTID_NEXT is \'%s\'. " }, { "ER_GTID_NEXT_TYPE_UNDEFINED_GROUP", 1837, "When @@SESSION.GTID_NEXT is s et to a GTID, you must explicitly set it again after a COMMIT or ROLLBACK. If you see this error message in the slave SQL thread, it means that a tabl e in the current transaction is transactional on the master and non-transac tional on the slave. In a client connection, it means that you executed SET @@SESSION.GTID_NEXT before a transaction and forgot to set @@SESSION.GTID_ NEXT to a different identifier or to \'AUTOMATIC\' after COMMIT or ROLLBACK . Current @@SESSION.GTID_NEXT is \'%s\'." },
{ "ER_VARIABLE_NOT_SETTABLE_IN_SP", 1838, "The system variable %.200s canno t be set in stored procedures." }, { "ER_VARIABLE_NOT_SETTABLE_IN_SP", 1838, "The system variable %.200s canno t be set in stored procedures." },
{ "ER_CANT_SET_GTID_PURGED_WHEN_GTID_MODE_IS_OFF", 1839, "GTID_PURGED can o { "ER_CANT_SET_GTID_PURGED_WHEN_GTID_MODE_IS_OFF", 1839, "@@GLOBAL.GTID_PUR
nly be set when GTID_MODE = ON." }, GED can only be set when @@GLOBAL.GTID_MODE = ON." },
{ "ER_CANT_SET_GTID_PURGED_WHEN_GTID_EXECUTED_IS_NOT_EMPTY", 1840, "GTID_PU { "ER_CANT_SET_GTID_PURGED_WHEN_GTID_EXECUTED_IS_NOT_EMPTY", 1840, "@@GLOBA
RGED can only be set when GTID_EXECUTED is empty." }, L.GTID_PURGED can only be set when @@GLOBAL.GTID_EXECUTED is empty." },
{ "ER_CANT_SET_GTID_PURGED_WHEN_OWNED_GTIDS_IS_NOT_EMPTY", 1841, "GTID_PURG { "ER_CANT_SET_GTID_PURGED_WHEN_OWNED_GTIDS_IS_NOT_EMPTY", 1841, "@@GLOBAL.
ED can only be set when there are no ongoing transactions (not even in othe GTID_PURGED can only be set when there are no ongoing transactions (not eve
r clients)." }, n in other clients)." },
{ "ER_GTID_PURGED_WAS_CHANGED", 1842, "GTID_PURGED was changed from \'%s\' { "ER_GTID_PURGED_WAS_CHANGED", 1842, "@@GLOBAL.GTID_PURGED was changed fro
to \'%s\'." }, m \'%s\' to \'%s\'." },
{ "ER_GTID_EXECUTED_WAS_CHANGED", 1843, "GTID_EXECUTED was changed from \'% { "ER_GTID_EXECUTED_WAS_CHANGED", 1843, "@@GLOBAL.GTID_EXECUTED was changed
s\' to \'%s\'." }, from \'%s\' to \'%s\'." },
{ "ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES", 1844, "Cannot execute statement : impossible to write to binary log since BINLOG_FORMAT = STATEMENT, and bo th replicated and non replicated tables are written to." }, { "ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES", 1844, "Cannot execute statement : impossible to write to binary log since BINLOG_FORMAT = STATEMENT, and bo th replicated and non replicated tables are written to." },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED", 1845, "%s is not supported for this o peration. Try %s." }, { "ER_ALTER_OPERATION_NOT_SUPPORTED", 1845, "%s is not supported for this o peration. Try %s." },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON", 1846, "%s is not supported. Re ason: %s. Try %s." }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON", 1846, "%s is not supported. Re ason: %s. Try %s." },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COPY", 1847, "COPY algorithm req uires a lock" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COPY", 1847, "COPY algorithm req uires a lock" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_PARTITION", 1848, "Partition spe cific operations do not yet support LOCK/ALGORITHM" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_PARTITION", 1848, "Partition spe cific operations do not yet support LOCK/ALGORITHM" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_RENAME", 1849, "Columns parti cipating in a foreign key are renamed" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_RENAME", 1849, "Columns parti cipating in a foreign key are renamed" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE", 1850, "Cannot chan ge column type INPLACE" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE", 1850, "Cannot chan ge column type INPLACE" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK", 1851, "Adding foreign keys needs foreign_key_checks=OFF" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK", 1851, "Adding foreign keys needs foreign_key_checks=OFF" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_IGNORE", 1852, "Creating unique indexes with IGNORE requires COPY algorithm to remove duplicate rows" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_IGNORE", 1852, "Creating unique indexes with IGNORE requires COPY algorithm to remove duplicate rows" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK", 1853, "Dropping a primary key is not allowed without also adding a new primary key" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK", 1853, "Dropping a primary key is not allowed without also adding a new primary key" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC", 1854, "Adding an auto- increment column requires a lock" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC", 1854, "Adding an auto- increment column requires a lock" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS", 1855, "Cannot repla ce hidden FTS_DOC_ID with a user-visible one" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS", 1855, "Cannot repla ce hidden FTS_DOC_ID with a user-visible one" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS", 1856, "Cannot drop or rename FTS_DOC_ID" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS", 1856, "Cannot drop or rename FTS_DOC_ID" },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS", 1857, "Fulltext index crea tion requires a lock" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS", 1857, "Fulltext index crea tion requires a lock" },
{ "ER_SQL_SLAVE_SKIP_COUNTER_NOT_SETTABLE_IN_GTID_MODE", 1858, "sql_slave_s kip_counter can not be set when the server is running with GTID_MODE = ON. Instead, for each transaction that you want to skip, generate an empty tran saction with the same GTID as the transaction" }, { "ER_SQL_SLAVE_SKIP_COUNTER_NOT_SETTABLE_IN_GTID_MODE", 1858, "sql_slave_s kip_counter can not be set when the server is running with @@GLOBAL.GTID_MO DE = ON. Instead, for each transaction that you want to skip, generate an e mpty transaction with the same GTID as the transaction" },
{ "ER_DUP_UNKNOWN_IN_INDEX", 1859, "Duplicate entry for key \'%-.192s\'" }, { "ER_DUP_UNKNOWN_IN_INDEX", 1859, "Duplicate entry for key \'%-.192s\'" },
{ "ER_IDENT_CAUSES_TOO_LONG_PATH", 1860, "Long database name and identifier for object resulted in path length exceeding %d characters. Path: \'%s\'." }, { "ER_IDENT_CAUSES_TOO_LONG_PATH", 1860, "Long database name and identifier for object resulted in path length exceeding %d characters. Path: \'%s\'." },
{ "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL", 1861, "cannot silentl y convert NULL values, as required in this SQL_MODE" }, { "ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL", 1861, "cannot silentl y convert NULL values, as required in this SQL_MODE" },
{ "ER_MUST_CHANGE_PASSWORD_LOGIN", 1862, "Your password has expired. To log
in you must change it using a client that supports expired passwords." },
{ "ER_ROW_IN_WRONG_PARTITION", 1863, "Found a row in wrong partition %s" },
 End of changes. 6 change blocks. 
46 lines changed or deleted 47 lines changed or added


 mysqld_error.h   mysqld_error.h 
skipping to change at line 866 skipping to change at line 866
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_IGNORE 1852 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_IGNORE 1852
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK 1853 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK 1853
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC 1854 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC 1854
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS 1855 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS 1855
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS 1856 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS 1856
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS 1857 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS 1857
#define ER_SQL_SLAVE_SKIP_COUNTER_NOT_SETTABLE_IN_GTID_MODE 1858 #define ER_SQL_SLAVE_SKIP_COUNTER_NOT_SETTABLE_IN_GTID_MODE 1858
#define ER_DUP_UNKNOWN_IN_INDEX 1859 #define ER_DUP_UNKNOWN_IN_INDEX 1859
#define ER_IDENT_CAUSES_TOO_LONG_PATH 1860 #define ER_IDENT_CAUSES_TOO_LONG_PATH 1860
#define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL 1861 #define ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL 1861
#define ER_ERROR_LAST 1861 #define ER_MUST_CHANGE_PASSWORD_LOGIN 1862
#define ER_ROW_IN_WRONG_PARTITION 1863
#define ER_ERROR_LAST 1863
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 plugin.h   plugin.h 
/* Copyright (c) 2005, 2011, 2012 Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2005, 2012, 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 541 skipping to change at line 541
int thd_sql_command(const MYSQL_THD thd); int thd_sql_command(const MYSQL_THD thd);
const char *thd_proc_info(MYSQL_THD thd, const char *info); const char *thd_proc_info(MYSQL_THD thd, const char *info);
void **thd_ha_data(const MYSQL_THD thd, const struct handlerton *hton); void **thd_ha_data(const MYSQL_THD thd, const struct handlerton *hton);
void thd_storage_lock_wait(MYSQL_THD thd, long long value); void thd_storage_lock_wait(MYSQL_THD thd, long long value);
int thd_tx_isolation(const MYSQL_THD thd); int thd_tx_isolation(const MYSQL_THD thd);
int thd_tx_is_read_only(const MYSQL_THD thd); int thd_tx_is_read_only(const MYSQL_THD thd);
char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length , char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length ,
unsigned int max_query_len); unsigned int max_query_len);
/* Increments the row counter, see THD::row_count */ /* Increments the row counter, see THD::row_count */
void thd_inc_row_count(MYSQL_THD thd); void thd_inc_row_count(MYSQL_THD thd);
int thd_allow_batch(MYSQL_THD thd);
/** /**
Create a temporary file. Create a temporary file.
@details @details
The temporary file is created in a location specified by the mysql The temporary file is created in a location specified by the mysql
server configuration (--tmpdir option). The caller does not need to server configuration (--tmpdir option). The caller does not need to
delete the file, it will be deleted automatically. delete the file, it will be deleted automatically.
@param prefix prefix for temporary file name @param prefix prefix for temporary file name
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 plugin_audit.h.pp   plugin_audit.h.pp 
skipping to change at line 236 skipping to change at line 236
long long thd_test_options(const void* thd, long long test_options); long long thd_test_options(const void* thd, long long test_options);
int thd_sql_command(const void* thd); int thd_sql_command(const void* thd);
const char *thd_proc_info(void* thd, const char *info); const char *thd_proc_info(void* thd, const char *info);
void **thd_ha_data(const void* thd, const struct handlerton *hton); void **thd_ha_data(const void* thd, const struct handlerton *hton);
void thd_storage_lock_wait(void* thd, long long value); void thd_storage_lock_wait(void* thd, long long value);
int thd_tx_isolation(const void* thd); int thd_tx_isolation(const void* thd);
int thd_tx_is_read_only(const void* thd); int thd_tx_is_read_only(const void* thd);
char *thd_security_context(void* thd, char *buffer, unsigned int length, char *thd_security_context(void* thd, char *buffer, unsigned int length,
unsigned int max_query_len); unsigned int max_query_len);
void thd_inc_row_count(void* thd); void thd_inc_row_count(void* thd);
int thd_allow_batch(void* thd);
int mysql_tmpfile(const char *prefix); int mysql_tmpfile(const char *prefix);
int thd_killed(const void* thd); int thd_killed(const void* thd);
void thd_binlog_pos(const void* thd, void thd_binlog_pos(const void* thd,
const char **file_var, const char **file_var,
unsigned long long *pos_var); unsigned long long *pos_var);
unsigned long thd_get_thread_id(const void* thd); unsigned long thd_get_thread_id(const void* thd);
void thd_get_xid(const void* thd, MYSQL_XID *xid); void thd_get_xid(const void* thd, MYSQL_XID *xid);
void mysql_query_cache_invalidate4(void* thd, void mysql_query_cache_invalidate4(void* thd,
const char *key, unsigned int key_length , const char *key, unsigned int key_length ,
int using_trx); int using_trx);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 plugin_auth.h.pp   plugin_auth.h.pp 
skipping to change at line 236 skipping to change at line 236
long long thd_test_options(const void* thd, long long test_options); long long thd_test_options(const void* thd, long long test_options);
int thd_sql_command(const void* thd); int thd_sql_command(const void* thd);
const char *thd_proc_info(void* thd, const char *info); const char *thd_proc_info(void* thd, const char *info);
void **thd_ha_data(const void* thd, const struct handlerton *hton); void **thd_ha_data(const void* thd, const struct handlerton *hton);
void thd_storage_lock_wait(void* thd, long long value); void thd_storage_lock_wait(void* thd, long long value);
int thd_tx_isolation(const void* thd); int thd_tx_isolation(const void* thd);
int thd_tx_is_read_only(const void* thd); int thd_tx_is_read_only(const void* thd);
char *thd_security_context(void* thd, char *buffer, unsigned int length, char *thd_security_context(void* thd, char *buffer, unsigned int length,
unsigned int max_query_len); unsigned int max_query_len);
void thd_inc_row_count(void* thd); void thd_inc_row_count(void* thd);
int thd_allow_batch(void* thd);
int mysql_tmpfile(const char *prefix); int mysql_tmpfile(const char *prefix);
int thd_killed(const void* thd); int thd_killed(const void* thd);
void thd_binlog_pos(const void* thd, void thd_binlog_pos(const void* thd,
const char **file_var, const char **file_var,
unsigned long long *pos_var); unsigned long long *pos_var);
unsigned long thd_get_thread_id(const void* thd); unsigned long thd_get_thread_id(const void* thd);
void thd_get_xid(const void* thd, MYSQL_XID *xid); void thd_get_xid(const void* thd, MYSQL_XID *xid);
void mysql_query_cache_invalidate4(void* thd, void mysql_query_cache_invalidate4(void* thd,
const char *key, unsigned int key_length , const char *key, unsigned int key_length ,
int using_trx); int using_trx);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 plugin_auth_common.h   plugin_auth_common.h 
#ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED #ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2010, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 plugin_ftparser.h.pp   plugin_ftparser.h.pp 
skipping to change at line 189 skipping to change at line 189
long long thd_test_options(const void* thd, long long test_options); long long thd_test_options(const void* thd, long long test_options);
int thd_sql_command(const void* thd); int thd_sql_command(const void* thd);
const char *thd_proc_info(void* thd, const char *info); const char *thd_proc_info(void* thd, const char *info);
void **thd_ha_data(const void* thd, const struct handlerton *hton); void **thd_ha_data(const void* thd, const struct handlerton *hton);
void thd_storage_lock_wait(void* thd, long long value); void thd_storage_lock_wait(void* thd, long long value);
int thd_tx_isolation(const void* thd); int thd_tx_isolation(const void* thd);
int thd_tx_is_read_only(const void* thd); int thd_tx_is_read_only(const void* thd);
char *thd_security_context(void* thd, char *buffer, unsigned int length, char *thd_security_context(void* thd, char *buffer, unsigned int length,
unsigned int max_query_len); unsigned int max_query_len);
void thd_inc_row_count(void* thd); void thd_inc_row_count(void* thd);
int thd_allow_batch(void* thd);
int mysql_tmpfile(const char *prefix); int mysql_tmpfile(const char *prefix);
int thd_killed(const void* thd); int thd_killed(const void* thd);
void thd_binlog_pos(const void* thd, void thd_binlog_pos(const void* thd,
const char **file_var, const char **file_var,
unsigned long long *pos_var); unsigned long long *pos_var);
unsigned long thd_get_thread_id(const void* thd); unsigned long thd_get_thread_id(const void* thd);
void thd_get_xid(const void* thd, MYSQL_XID *xid); void thd_get_xid(const void* thd, MYSQL_XID *xid);
void mysql_query_cache_invalidate4(void* thd, void mysql_query_cache_invalidate4(void* thd,
const char *key, unsigned int key_length , const char *key, unsigned int key_length ,
int using_trx); int using_trx);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 psi.h   psi.h 
/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2008, 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 1375 skipping to change at line 1375
Assign a state to the instrumented thread. Assign a state to the instrumented thread.
@param state the thread state @param state the thread state
*/ */
typedef void (*set_thread_state_v1_t)(const char* state); typedef void (*set_thread_state_v1_t)(const char* state);
/** /**
Assign a process info to the instrumented thread. Assign a process info to the instrumented thread.
@param info the process into string @param info the process into string
@param info_len the process into string length @param info_len the process into string length
*/ */
typedef void (*set_thread_info_v1_t)(const char* info, int info_len); typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
/** /**
Attach a thread instrumentation to the running thread. Attach a thread instrumentation to the running thread.
In case of thread pools, this method should be called when In case of thread pools, this method should be called when
a worker thread picks a work item and runs it. a worker thread picks a work item and runs it.
Also, this method should be called if the instrumented code does not Also, this method should be called if the instrumented code does not
keep the pointer returned by @c new_thread() and relies on @c get_thread( ) keep the pointer returned by @c new_thread() and relies on @c get_thread( )
instead. instead.
@param thread the thread instrumentation @param thread the thread instrumentation
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 service_my_snprintf.h   service_my_snprintf.h 
#ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED #ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2009, 2012, 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 52 skipping to change at line 52
% <flag> <width> <precision> <length modifier> <format> % <flag> <width> <precision> <length modifier> <format>
where everithing but the format is optional. where everithing but the format is optional.
Three one-character flags are recognized: Three one-character flags are recognized:
'0' has the standard zero-padding semantics; '0' has the standard zero-padding semantics;
'-' is parsed, but silently ignored; '-' is parsed, but silently ignored;
'`' (backtick) is only supported for strings (%s) and means that the '`' (backtick) is only supported for strings (%s) and means that the
string will be quoted according to MySQL identifier quoting rules. string will be quoted according to MySQL identifier quoting rules.
Both <width> and <precision> can be specified as numbers or '*'. Both <width> and <precision> can be specified as numbers or '*'.
If an asterisk is used, an argument of type int is consumed.
<length modifier> can be 'l', 'll', or 'z'. <length modifier> can be 'l', 'll', or 'z'.
Supported formats are 's' (null pointer is accepted, printed as Supported formats are 's' (null pointer is accepted, printed as
"(null)"), 'b' (extension, see below), 'c', 'd', 'i', 'u', 'x', 'o', "(null)"), 'b' (extension, see below), 'c', 'd', 'i', 'u', 'x', 'o',
'X', 'p' (works as 0x%x). 'X', 'p' (works as 0x%x).
Standard syntax for positional arguments $n is supported. Standard syntax for positional arguments $n is supported.
Extensions: Extensions:
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 services.h   services.h 
#ifndef MYSQL_SERVICES_INCLUDED #ifndef MYSQL_SERVICES_INCLUDED
/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2009, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 sslopt-longopts.h   sslopt-longopts.h 
#ifndef SSLOPT_LONGOPTS_INCLUDED #ifndef SSLOPT_LONGOPTS_INCLUDED
#define SSLOPT_LONGOPTS_INCLUDED #define SSLOPT_LONGOPTS_INCLUDED
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reser ved. /* Copyright (c) 2000, 2012, 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.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/