big_endian.h | big_endian.h | |||
---|---|---|---|---|
/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. | |||
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 | |||
byte_order_generic.h | byte_order_generic.h | |||
---|---|---|---|---|
/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2001, 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 | |||
byte_order_generic_x86.h | byte_order_generic_x86.h | |||
---|---|---|---|---|
/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2001, 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 | |||
byte_order_generic_x86_64.h | byte_order_generic_x86_64.h | |||
---|---|---|---|---|
/* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2001, 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 | |||
innodb_priv.h | innodb_priv.h | |||
---|---|---|---|---|
/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. | |||
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 | |||
little_endian.h | little_endian.h | |||
---|---|---|---|---|
/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. | |||
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 | |||
---|---|---|---|---|
skipping to change at line 550 | skipping to change at line 550 | |||
/* #undef EXTRA_DEBUG */ | /* #undef EXTRA_DEBUG */ | |||
/* #undef BACKUP_TEST */ | /* #undef BACKUP_TEST */ | |||
/* #undef CYBOZU */ | /* #undef CYBOZU */ | |||
#define OPTIMIZER_TRACE 1 | #define OPTIMIZER_TRACE 1 | |||
/* #undef USE_SYMDIR */ | /* #undef USE_SYMDIR */ | |||
/* | /* | |||
InnoDB config options | InnoDB config options | |||
*/ | */ | |||
#define INNODB_COMPILER_HINTS | #define INNODB_COMPILER_HINTS | |||
#define INNODB_PAGE_ATOMIC_REF_COUNT | ||||
/* 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 628 | skipping to change at line 629 | |||
/* #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.15" | #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.6.16" | |||
#define SHAREDIR "/home/ut/testing/mysql/5.6.15/share" | #define SHAREDIR "/home/ut/testing/mysql/5.6.16/share" | |||
#define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.15" | #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.6.16" | |||
#define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.15/data" | #define MYSQL_DATADIR "/home/ut/testing/mysql/5.6.16/data" | |||
#define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.15" | #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.6.16" | |||
#define PLUGINDIR "/home/ut/testing/mysql/5.6.15/lib/plugin" | #define PLUGINDIR "/home/ut/testing/mysql/5.6.16/lib/plugin" | |||
#define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.15/etc" | #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.6.16/etc" | |||
#define DEFAULT_TMPDIR P_tmpdir | ||||
/* #undef SO_EXT */ | /* #undef SO_EXT */ | |||
#define MYSQL_VERSION_MAJOR 5 | #define MYSQL_VERSION_MAJOR 5 | |||
#define MYSQL_VERSION_MINOR 6 | #define MYSQL_VERSION_MINOR 6 | |||
#define MYSQL_VERSION_PATCH 15 | #define MYSQL_VERSION_PATCH 16 | |||
#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.15" | #define PACKAGE_STRING "MySQL Server 5.6.16" | |||
#define PACKAGE_TARNAME "mysql" | #define PACKAGE_TARNAME "mysql" | |||
#define PACKAGE_VERSION "5.6.15" | #define PACKAGE_VERSION "5.6.16" | |||
#define VERSION "5.6.15" | #define VERSION "5.6.16" | |||
#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 | 13 lines changed or added | |||
my_dbug.h | my_dbug.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 | |||
my_getopt.h | my_getopt.h | |||
---|---|---|---|---|
/* | /* | |||
Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reser ved. | Copyright (c) 2002, 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 | |||
my_pthread.h | my_pthread.h | |||
---|---|---|---|---|
skipping to change at line 138 | skipping to change at line 138 | |||
((TS1.tv.i64 < TS2.tv.i64) ? -1 : 0)) | ((TS1.tv.i64 < TS2.tv.i64) ? -1 : 0)) | |||
#define diff_timespec(TS1, TS2) \ | #define diff_timespec(TS1, TS2) \ | |||
((TS1.tv.i64 - TS2.tv.i64) * 100) | ((TS1.tv.i64 - TS2.tv.i64) * 100) | |||
int win_pthread_mutex_trylock(pthread_mutex_t *mutex); | int win_pthread_mutex_trylock(pthread_mutex_t *mutex); | |||
int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, vo id *); | int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, vo id *); | |||
int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) ; | int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) ; | |||
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); | int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); | |||
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, | int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, | |||
struct timespec *abstime); | const struct timespec *abstime); | |||
int pthread_cond_signal(pthread_cond_t *cond); | int pthread_cond_signal(pthread_cond_t *cond); | |||
int pthread_cond_broadcast(pthread_cond_t *cond); | int pthread_cond_broadcast(pthread_cond_t *cond); | |||
int pthread_cond_destroy(pthread_cond_t *cond); | int pthread_cond_destroy(pthread_cond_t *cond); | |||
int pthread_attr_init(pthread_attr_t *connect_att); | int pthread_attr_init(pthread_attr_t *connect_att); | |||
int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack); | int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack); | |||
int pthread_attr_destroy(pthread_attr_t *connect_att); | int pthread_attr_destroy(pthread_attr_t *connect_att); | |||
int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(vo id)); | int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(vo id)); | |||
struct tm *localtime_r(const time_t *timep,struct tm *tmp); | struct tm *localtime_r(const time_t *timep,struct tm *tmp); | |||
struct tm *gmtime_r(const time_t *timep,struct tm *tmp); | struct tm *gmtime_r(const time_t *timep,struct tm *tmp); | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
mysql_thread.h | mysql_thread.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 1170 | skipping to change at line 1170 | |||
/* Non instrumented code */ | /* Non instrumented code */ | |||
result= my_cond_wait(&that->m_cond, &mutex->m_mutex); | result= my_cond_wait(&that->m_cond, &mutex->m_mutex); | |||
return result; | return result; | |||
} | } | |||
static inline int inline_mysql_cond_timedwait( | static inline int inline_mysql_cond_timedwait( | |||
mysql_cond_t *that, | mysql_cond_t *that, | |||
mysql_mutex_t *mutex, | mysql_mutex_t *mutex, | |||
struct timespec *abstime | const struct timespec *abstime | |||
#ifdef HAVE_PSI_COND_INTERFACE | #ifdef HAVE_PSI_COND_INTERFACE | |||
, const char *src_file, uint src_line | , const char *src_file, uint src_line | |||
#endif | #endif | |||
) | ) | |||
{ | { | |||
int result; | int result; | |||
#ifdef HAVE_PSI_COND_INTERFACE | #ifdef HAVE_PSI_COND_INTERFACE | |||
if (that->m_psi != NULL) | if (that->m_psi != NULL) | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 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.15" | #define MYSQL_SERVER_VERSION "5.6.16" | |||
#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 50615 | #define MYSQL_VERSION_ID 50616 | |||
#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 882 | skipping to change at line 882 | |||
{ "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." }, | { "ER_TABLE_CORRUPT", 1877, "Operation cannot be performed. The table \'%-. 64s.%-.64s\' is missing, corrupt or contains bad data." }, | |||
{ "ER_TEMP_FILE_WRITE_FAILURE", 1878, "Temporary file write failure." }, | { "ER_TEMP_FILE_WRITE_FAILURE", 1878, "Temporary file write failure." }, | |||
{ "ER_INNODB_FT_AUX_NOT_HEX_ID", 1879, "Upgrade index name failed, please u | ||||
se create index(alter table) algorithm copy to rebuild index." }, | ||||
{ "ER_OLD_TEMPORALS_UPGRADED", 1880, "TIME/TIMESTAMP/DATETIME columns of ol | ||||
d format have been upgraded to the new format." }, | ||||
{ "ER_INNODB_FORCED_RECOVERY", 1881, "Operation not allowed when innodb_for | ||||
ced_recovery > 0." }, | ||||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 0 lines changed or added | |||
mysqld_error.h | mysqld_error.h | |||
---|---|---|---|---|
skipping to change at line 883 | skipping to change at line 883 | |||
#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_TABLE_CORRUPT 1877 | #define ER_TABLE_CORRUPT 1877 | |||
#define ER_TEMP_FILE_WRITE_FAILURE 1878 | #define ER_TEMP_FILE_WRITE_FAILURE 1878 | |||
#define ER_ERROR_LAST 1878 | #define ER_INNODB_FT_AUX_NOT_HEX_ID 1879 | |||
#define ER_OLD_TEMPORALS_UPGRADED 1880 | ||||
#define ER_INNODB_FORCED_RECOVERY 1881 | ||||
#define ER_ERROR_LAST 1881 | ||||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 0 lines changed or added | |||
plugin.h | plugin.h | |||
---|---|---|---|---|
/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2005, 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 | |||
plugin_audit.h | plugin_audit.h | |||
---|---|---|---|---|
/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reser ved. | /* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reser ved. | |||
This program is free software; you can redistribute it and/or | This program is free software; you can redistribute it and/or | |||
modify it under the terms of the GNU General Public License | modify it under the terms of the GNU General Public License | |||
as published by the Free Software Foundation; version 2 of | as published by the Free Software Foundation; version 2 of | |||
the License. | 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 | |||
service_thread_scheduler.h | service_thread_scheduler.h | |||
---|---|---|---|---|
/* | /* | |||
Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserv ed. | Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. | |||
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 | |||