diff options
| author | monty@mashka.mysql.fi <> | 2002-10-02 13:33:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-10-02 13:33:08 +0300 |
| commit | d69250a969449da43891ef5b2859df77917183a8 (patch) | |
| tree | 5a27bda6d3f628af7dcb922ad022e84cf8cb351c /include/errmsg.h | |
| parent | 7134ffec210edde21860a2b2c2654be481de49b4 (diff) | |
| download | mariadb-git-d69250a969449da43891ef5b2859df77917183a8.tar.gz | |
Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
Diffstat (limited to 'include/errmsg.h')
| -rw-r--r-- | include/errmsg.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 175089ba371..d97522f0972 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -63,15 +63,12 @@ extern const char *client_errors[]; /* Error messages */ #define CR_PROBE_MASTER_CONNECT 2025 /* new 4.1 error codes */ -#define CR_INVALID_CONN_HANDLE 2026 -#define CR_NULL_POINTER 2027 -#define CR_MEMORY_ERROR 2028 -#define CR_NO_PREPARE_STMT 2029 -#define CR_NOT_ALL_PARAMS_BOUND 2030 -#define CR_DATA_TRUNCATED 2031 -#define CR_NOT_ALL_BUFFERS_BOUND 2032 -#define CR_FAILED_TO_SET_PARAM_DATA 2033 -#define CR_NO_PARAMETERS_EXISTS 2033 -#define CR_INVALID_PARAMETER_NO 2035 -#define CR_INVALID_BUFFER_USE 2036 - +#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 |