mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +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.
82 lines
2.5 KiB
C
82 lines
2.5 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 */
|
|
|
|
#ifndef _mysys_err_h
|
|
#define _mysys_err_h
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#define GLOBERRS (EE_ERROR_LAST - EE_ERROR_FIRST + 1) /* Nr of global errors */
|
|
#define EE(X) (globerrs[(X) - EE_ERROR_FIRST])
|
|
|
|
extern const char * NEAR globerrs[]; /* my_error_messages is here */
|
|
|
|
/* Error message numbers in global map */
|
|
/* Do not add error numbers before EE_ERROR_FIRST. */
|
|
/* If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. */
|
|
#define EE_ERROR_FIRST 0 /*Copy first error nr.*/
|
|
#define EE_FILENOTFOUND 0
|
|
#define EE_CANTCREATEFILE 1
|
|
#define EE_READ 2
|
|
#define EE_WRITE 3
|
|
#define EE_BADCLOSE 4
|
|
#define EE_OUTOFMEMORY 5
|
|
#define EE_DELETE 6
|
|
#define EE_LINK 7
|
|
#define EE_EOFERR 9
|
|
#define EE_CANTLOCK 10
|
|
#define EE_CANTUNLOCK 11
|
|
#define EE_DIR 12
|
|
#define EE_STAT 13
|
|
#define EE_CANT_CHSIZE 14
|
|
#define EE_CANT_OPEN_STREAM 15
|
|
#define EE_GETWD 16
|
|
#define EE_SETWD 17
|
|
#define EE_LINK_WARNING 18
|
|
#define EE_OPEN_WARNING 19
|
|
#define EE_DISK_FULL 20
|
|
#define EE_CANT_MKDIR 21
|
|
#define EE_UNKNOWN_CHARSET 22
|
|
#define EE_OUT_OF_FILERESOURCES 23
|
|
#define EE_CANT_READLINK 24
|
|
#define EE_CANT_SYMLINK 25
|
|
#define EE_REALPATH 26
|
|
#define EE_SYNC 27
|
|
#define EE_ERROR_LAST 27 /*Copy last error nr.*/
|
|
/* Add error numbers before EE_ERROR_LAST and change it accordingly. */
|
|
|
|
/* exit codes for all MySQL programs */
|
|
|
|
#define EXIT_UNSPECIFIED_ERROR 1
|
|
#define EXIT_UNKNOWN_OPTION 2
|
|
#define EXIT_AMBIGUOUS_OPTION 3
|
|
#define EXIT_NO_ARGUMENT_ALLOWED 4
|
|
#define EXIT_ARGUMENT_REQUIRED 5
|
|
#define EXIT_VAR_PREFIX_NOT_UNIQUE 6
|
|
#define EXIT_UNKNOWN_VARIABLE 7
|
|
#define EXIT_OUT_OF_MEMORY 8
|
|
#define EXIT_UNKNOWN_SUFFIX 9
|
|
#define EXIT_NO_PTR_TO_VARIABLE 10
|
|
#define EXIT_CANNOT_CONNECT_TO_SERVICE 11
|
|
#define EXIT_OPTION_DISABLED 12
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|
|
|