mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
bec3feaa0b
Changed my_error() to print error messages, which come from arbitrary registered ranges of error messages. Messages can be unregistered (and should be at end of the program). Added registration of handler error messages. Added a new mi_print_error() macro and a new mi_report_error() function, which supply error messages with a table name. Added calls to mi_print_error() or mi_report_error() at all places in MyISAM, where table corruption is detected. extra/comp_err.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added prints for ER_ERROR_FIRST and ER_ERROR_LAST. Removed print for ER_ERROR_MESSAGES. include/errmsg.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added declaration for a new function. Added first and last error number defines. include/my_base.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added first and last error number defines. include/my_sys.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Removed obsolete defines. Removed a global variable, which held pointers to the error message arrays. Added declarations for new functions. include/mysys_err.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Removed an obsolete define. Changed two defines to use the new defines. Added first and last error number defines. libmysql/errmsg.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Replaced global array initialization by proper registration and unregistration of client error messages. libmysql/libmysql.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added a call for unregistration of client error messages. myisam/mi_delete.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. Added a debugging call to test undefined error numbers in case a special debug string is set. myisam/mi_extra.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_info.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added the error logging function. myisam/mi_key.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_keycache.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_locking.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_open.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/mi_page.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_range.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_rkey.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_search.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. myisam/mi_update.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/mi_write.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Added calls to the new error logging function at all places, where corruption is detected. Added a debugging call to pretend MyISAM corruption in case a special debug string is set. myisam/myisamdef.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Added the declaration of the new error logging function and a new macro. mysql-test/r/merge.result: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed test results. These come from the changed error reporting in openfrm(). mysql-test/r/repair.result: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed test results. These come from the changed error reporting in openfrm(). mysql-test/t/merge.test: WL#1895 - Print message to error log in case of detected MyISAM corruption Changederror numbers. These come from the changed error reporting in openfrm(). mysys/errors.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Dropped the assignment of the global errors to the dropped global pointer array. mysys/my_error.c: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed my_error() from using a static array of pointers to error message arrays to using a linked list of structures with pointers to array message arrays. Added functions for registering and unregistering error message arrays to the chain. sql/derror.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed reading of mysqld error messages to using the new registering and unregistering functions. sql/handler.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Added initialization and deinitialization of handler error messages. Included more handler error messages in the mapping to mysqld error messages. sql/mysqld.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed deinitialization of error messages to proper unregistration. sql/table.cc: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed error reporting in openfrm() so that error messages from handler::ha_open() are reported by handler::print_error(). This changed messages from "Can't open 't1.MYI' (errno: 130)" to "Incorrect file format 't1'" for example. sql/unireg.h: WL#1895 - Print message to error log in case of detected MyISAM corruption Changed two defines to use the new defines.
99 lines
3.6 KiB
C
99 lines
3.6 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
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
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Error messages for MySQL clients */
|
|
/* (Error messages for the daemon are in share/language/errmsg.sys) */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
void init_client_errs(void);
|
|
void finish_client_errs(void);
|
|
extern const char *client_errors[]; /* Error messages */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define CR_MIN_ERROR 2000 /* For easier client code */
|
|
#define CR_MAX_ERROR 2999
|
|
#if defined(OS2) && defined(MYSQL_SERVER)
|
|
#define CER(X) client_errors[(X)-CR_MIN_ERROR]
|
|
#elif !defined(ER)
|
|
#define ER(X) client_errors[(X)-CR_MIN_ERROR]
|
|
#endif
|
|
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
|
|
|
|
/* Do not add error numbers before CR_ERROR_FIRST. */
|
|
/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
|
|
#define CR_ERROR_FIRST 2000 /*Copy first error nr.*/
|
|
#define CR_UNKNOWN_ERROR 2000
|
|
#define CR_SOCKET_CREATE_ERROR 2001
|
|
#define CR_CONNECTION_ERROR 2002
|
|
#define CR_CONN_HOST_ERROR 2003
|
|
#define CR_IPSOCK_ERROR 2004
|
|
#define CR_UNKNOWN_HOST 2005
|
|
#define CR_SERVER_GONE_ERROR 2006
|
|
#define CR_VERSION_ERROR 2007
|
|
#define CR_OUT_OF_MEMORY 2008
|
|
#define CR_WRONG_HOST_INFO 2009
|
|
#define CR_LOCALHOST_CONNECTION 2010
|
|
#define CR_TCP_CONNECTION 2011
|
|
#define CR_SERVER_HANDSHAKE_ERR 2012
|
|
#define CR_SERVER_LOST 2013
|
|
#define CR_COMMANDS_OUT_OF_SYNC 2014
|
|
#define CR_NAMEDPIPE_CONNECTION 2015
|
|
#define CR_NAMEDPIPEWAIT_ERROR 2016
|
|
#define CR_NAMEDPIPEOPEN_ERROR 2017
|
|
#define CR_NAMEDPIPESETSTATE_ERROR 2018
|
|
#define CR_CANT_READ_CHARSET 2019
|
|
#define CR_NET_PACKET_TOO_LARGE 2020
|
|
#define CR_EMBEDDED_CONNECTION 2021
|
|
#define CR_PROBE_SLAVE_STATUS 2022
|
|
#define CR_PROBE_SLAVE_HOSTS 2023
|
|
#define CR_PROBE_SLAVE_CONNECT 2024
|
|
#define CR_PROBE_MASTER_CONNECT 2025
|
|
#define CR_SSL_CONNECTION_ERROR 2026
|
|
#define CR_MALFORMED_PACKET 2027
|
|
#define CR_WRONG_LICENSE 2028
|
|
|
|
/* new 4.1 error codes */
|
|
#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 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_ABANDONED_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_CANCELED 2050
|
|
#define CR_NO_DATA 2051
|
|
#define CR_ERROR_LAST /*Copy last error nr:*/ 2051
|
|
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
|
|
|