| 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, 2014, 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 35 | skipping to change at line 35 | |||
| void init_client_errs(void); | void init_client_errs(void); | |||
| void finish_client_errs(void); | void finish_client_errs(void); | |||
| extern const char *client_errors[]; /* Error messages */ | extern const char *client_errors[]; /* Error messages */ | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| } | } | |||
| #endif | #endif | |||
| #define CR_MIN_ERROR 2000 /* For easier client code */ | #define CR_MIN_ERROR 2000 /* For easier client code */ | |||
| #define CR_MAX_ERROR 2999 | #define CR_MAX_ERROR 2999 | |||
| #if !defined(ER) | #if !defined(ER) | |||
| #define ER(X) client_errors[(X)-CR_MIN_ERROR] | #define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \ | |||
| client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ | ||||
| ERROR]) | ||||
| #endif | #endif | |||
| #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ | #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ | |||
| /* Do not add error numbers before CR_ERROR_FIRST. */ | /* Do not add error numbers before CR_ERROR_FIRST. */ | |||
| /* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */ | /* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */ | |||
| #define CR_ERROR_FIRST 2000 /*Copy first error nr.*/ | #define CR_ERROR_FIRST 2000 /*Copy first error nr.*/ | |||
| #define CR_UNKNOWN_ERROR 2000 | #define CR_UNKNOWN_ERROR 2000 | |||
| #define CR_SOCKET_CREATE_ERROR 2001 | #define CR_SOCKET_CREATE_ERROR 2001 | |||
| #define CR_CONNECTION_ERROR 2002 | #define CR_CONNECTION_ERROR 2002 | |||
| #define CR_CONN_HOST_ERROR 2003 | #define CR_CONN_HOST_ERROR 2003 | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 5 lines changed or added | |||
| my_config.h | my_config.h | |||
|---|---|---|---|---|
| skipping to change at line 588 | skipping to change at line 588 | |||
| /* #undef WITH_MYISAMMRG_STORAGE_ENGINE */ | /* #undef WITH_MYISAMMRG_STORAGE_ENGINE */ | |||
| /* #undef WITH_HEAP_STORAGE_ENGINE */ | /* #undef WITH_HEAP_STORAGE_ENGINE */ | |||
| /* #undef WITH_CSV_STORAGE_ENGINE */ | /* #undef WITH_CSV_STORAGE_ENGINE */ | |||
| /* #undef WITH_PARTITION_STORAGE_ENGINE */ | /* #undef WITH_PARTITION_STORAGE_ENGINE */ | |||
| /* #undef WITH_PERFSCHEMA_STORAGE_ENGINE */ | /* #undef WITH_PERFSCHEMA_STORAGE_ENGINE */ | |||
| /* #undef WITH_NDBCLUSTER_STORAGE_ENGINE */ | /* #undef WITH_NDBCLUSTER_STORAGE_ENGINE */ | |||
| #if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY) | #if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY) | |||
| # define HAVE_NDB_BINLOG 1 | # define HAVE_NDB_BINLOG 1 | |||
| #endif | #endif | |||
| #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.37" | #define DEFAULT_MYSQL_HOME "/home/ut/testing/mysql/5.5.38" | |||
| #define SHAREDIR "/home/ut/testing/mysql/5.5.37/share" | #define SHAREDIR "/home/ut/testing/mysql/5.5.38/share" | |||
| #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.37" | #define DEFAULT_BASEDIR "/home/ut/testing/mysql/5.5.38" | |||
| #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.37/data" | #define MYSQL_DATADIR "/home/ut/testing/mysql/5.5.38/data" | |||
| #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.37" | #define DEFAULT_CHARSET_HOME "/home/ut/testing/mysql/5.5.38" | |||
| #define PLUGINDIR "/home/ut/testing/mysql/5.5.37/lib/plugin" | #define PLUGINDIR "/home/ut/testing/mysql/5.5.38/lib/plugin" | |||
| #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.37/etc" | #define DEFAULT_SYSCONFDIR "/home/ut/testing/mysql/5.5.38/etc" | |||
| #define DEFAULT_TMPDIR P_tmpdir | #define DEFAULT_TMPDIR P_tmpdir | |||
| /* #undef SO_EXT */ | /* #undef SO_EXT */ | |||
| #define MYSQL_MAJOR_VERSION 5 | #define MYSQL_MAJOR_VERSION 5 | |||
| #define MYSQL_MINOR_VERSION 5 | #define MYSQL_MINOR_VERSION 5 | |||
| #define PACKAGE "mysql" | #define PACKAGE "mysql" | |||
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT "" | |||
| #define PACKAGE_NAME "MySQL Server" | #define PACKAGE_NAME "MySQL Server" | |||
| #define PACKAGE_STRING "MySQL Server 5.5.37" | #define PACKAGE_STRING "MySQL Server 5.5.38" | |||
| #define PACKAGE_TARNAME "mysql" | #define PACKAGE_TARNAME "mysql" | |||
| #define PACKAGE_VERSION "5.5.37" | #define PACKAGE_VERSION "5.5.38" | |||
| #define VERSION "5.5.37" | #define VERSION "5.5.38" | |||
| #define PROTOCOL_VERSION 10 | #define PROTOCOL_VERSION 10 | |||
| /* time_t related defines */ | /* time_t related defines */ | |||
| #define SIZEOF_TIME_T 4 | #define SIZEOF_TIME_T 4 | |||
| /* #undef TIME_T_UNSIGNED */ | /* #undef TIME_T_UNSIGNED */ | |||
| #endif | #endif | |||
| End of changes. 3 change blocks. | ||||
| 10 lines changed or deleted | 10 lines changed or added | |||
| mysql_version.h | mysql_version.h | |||
|---|---|---|---|---|
| skipping to change at line 14 | skipping to change at line 14 | |||
| */ | */ | |||
| /* Version numbers for protocol & mysqld */ | /* Version numbers for protocol & mysqld */ | |||
| #ifndef _mysql_version_h | #ifndef _mysql_version_h | |||
| #define _mysql_version_h | #define _mysql_version_h | |||
| #ifdef _CUSTOMCONFIG_ | #ifdef _CUSTOMCONFIG_ | |||
| #include <custom_conf.h> | #include <custom_conf.h> | |||
| #else | #else | |||
| #define PROTOCOL_VERSION 10 | #define PROTOCOL_VERSION 10 | |||
| #define MYSQL_SERVER_VERSION "5.5.37" | #define MYSQL_SERVER_VERSION "5.5.38" | |||
| #define MYSQL_BASE_VERSION "mysqld-5.5" | #define MYSQL_BASE_VERSION "mysqld-5.5" | |||
| #define MYSQL_SERVER_SUFFIX_DEF "" | #define MYSQL_SERVER_SUFFIX_DEF "" | |||
| #define FRM_VER 6 | #define FRM_VER 6 | |||
| #define MYSQL_VERSION_ID 50537 | #define MYSQL_VERSION_ID 50538 | |||
| #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 | |||