From 28813a9ea9b5149b7c370f616232ea60dadf852c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Mar 2004 18:33:38 +0200 Subject: Added test to show bug in current union implementation After merge fixes Portability fixes client/mysqltest.c: Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row) include/errmsg.h: After merge fixes mysql-test/mysql-test-run.sh: merge fix mysql-test/r/system_mysql_db.result: Updated results for 4.1 mysql-test/r/union.result: Added new test mysql-test/t/derived.test: Portability fix (for Mac OS X) mysql-test/t/system_mysql_db_refs.test: Remove warnings mysql-test/t/union.test: Added test to show bug in current union implementation (to be fixed in 4.1) scripts/mysql_create_system_tables.sh: Fix wrong column define scripts/mysql_fix_privilege_tables.sh: Fix for mysql-test-run scripts/mysql_fix_privilege_tables.sql: Merge with 4.0 to get comments. Updated so that it works with privilege tables for MySQL 3.23. sql/repl_failsafe.cc: After merge fix --- include/errmsg.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'include/errmsg.h') diff --git a/include/errmsg.h b/include/errmsg.h index 76a293f3dec..140ff531248 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -66,27 +66,27 @@ extern const char *client_errors[]; /* Error messages */ #define CR_WRONG_LICENSE 2028 /* new 4.1 error codes */ -#define CR_NULL_POINTER 2028 -#define CR_NO_PREPARE_STMT 2029 -#define CR_PARAMS_NOT_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_NULL_POINTER 2029 +#define CR_NO_PREPARE_STMT 2030 +#define CR_PARAMS_NOT_BOUND 2031 +#define CR_DATA_TRUNCATED 2032 +#define CR_NO_PARAMETERS_EXISTS 2033 +#define CR_INVALID_PARAMETER_NO 2034 +#define CR_INVALID_BUFFER_USE 2035 +#define CR_UNSUPPORTED_PARAM_TYPE 2036 -#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 -#define CR_INVALID_CONN_HANDLE 2047 -#define CR_SECURE_AUTH 2048 -#define CR_FETCH_CANCELLED 2049 -#define CR_NO_DATA 2050 +#define CR_SHARED_MEMORY_CONNECTION 2037 +#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2038 +#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2039 +#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2040 +#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2041 +#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042 +#define CR_SHARED_MEMORY_MAP_ERROR 2043 +#define CR_SHARED_MEMORY_EVENT_ERROR 2044 +#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2045 +#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046 +#define CR_CONN_UNKNOW_PROTOCOL 2047 +#define CR_INVALID_CONN_HANDLE 2048 +#define CR_SECURE_AUTH 2049 +#define CR_FETCH_CANCELLED 2050 +#define CR_NO_DATA 2051 -- cgit v1.2.1