diff options
| author | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
| commit | dac6498f9b5b28d94473baf46c6e6f174943728d (patch) | |
| tree | d3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /include/errmsg.h | |
| parent | 305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff) | |
| parent | e60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff) | |
| download | mariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz | |
Merge with 4.0
Diffstat (limited to 'include/errmsg.h')
| -rw-r--r-- | include/errmsg.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 5ac5ef9a4a7..703395a3742 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -61,26 +61,27 @@ extern const char *client_errors[]; /* Error messages */ #define CR_PROBE_SLAVE_HOSTS 2023 #define CR_PROBE_SLAVE_CONNECT 2024 #define CR_PROBE_MASTER_CONNECT 2025 +#define CR_SSL_CONNECTION_ERROR 2026 /* new 4.1 error codes */ -#define CR_INVALID_CONN_HANDLE 2026 -#define CR_NULL_POINTER 2027 -#define CR_NO_PREPARE_STMT 2028 -#define CR_NOT_ALL_PARAMS_BOUND 2029 -#define CR_DATA_TRUNCATED 2030 -#define CR_NO_PARAMETERS_EXISTS 2031 -#define CR_INVALID_PARAMETER_NO 2032 -#define CR_INVALID_BUFFER_USE 2033 -#define CR_UNSUPPORTED_PARAM_TYPE 2034 +#define CR_INVALID_CONN_HANDLE 2027 +#define CR_NULL_POINTER 2028 +#define CR_NO_PREPARE_STMT 2029 +#define CR_NOT_ALL_PARAMS_BOUND 2030 +#define CR_DATA_TRUNCATED 2031 +#define CR_NO_PARAMETERS_EXISTS 2032 +#define CR_INVALID_PARAMETER_NO 2033 +#define CR_INVALID_BUFFER_USE 2034 +#define CR_UNSUPPORTED_PARAM_TYPE 2035 -#define CR_SHARED_MEMORY_CONNECTION 2035 -#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2036 -#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2037 -#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2038 -#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2039 -#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2040 -#define CR_SHARED_MEMORY_MAP_ERROR 2041 -#define CR_SHARED_MEMORY_EVENT_ERROR 2042 -#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2043 -#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046 -#define CR_CONN_UNKNOW_PROTOCOL 2048 +#define CR_SHARED_MEMORY_CONNECTION 2036 +#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2037 +#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2038 +#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2039 +#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2040 +#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2041 +#define CR_SHARED_MEMORY_MAP_ERROR 2042 +#define CR_SHARED_MEMORY_EVENT_ERROR 2043 +#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2044 +#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2045 +#define CR_CONN_UNKNOW_PROTOCOL 2046 |