diff options
| author | ingo@mysql.com <> | 2004-12-23 20:11:38 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2004-12-23 20:11:38 +0100 |
| commit | c39be2d0e7e4df339617efc96e1a38aab36be82b (patch) | |
| tree | 50e9e32282ae9dd90825e12f5be6e80b9e77f31f /include/my_sys.h | |
| parent | 1ea48a2dbf197b3e49874deace2fff5fd7c4b34e (diff) | |
| download | mariadb-git-c39be2d0e7e4df339617efc96e1a38aab36be82b.tar.gz | |
WL#1895 - Print message to error log in case of detected MyISAM corruption
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.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index e630c9bdbba..cbcd6f0f833 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -43,8 +43,6 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MYSYS_PROGRAM_DONT_USE_CURSES() { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;} #define MY_INIT(name); { my_progname= name; my_init(); } -#define MAXMAPS (4) /* Number of error message maps */ -#define ERRMOD (1000) /* Max number of errors in a map */ #define ERRMSGSIZE (SC_MAXWIDTH) /* Max length of a error message */ #define NRERRBUFFS (2) /* Buffers for parameters */ #define MY_FILE_ERROR ((uint) ~0) @@ -213,7 +211,6 @@ void __CDECL hfree(void *ptr); #else extern int errno; /* declare errno */ #endif -extern const char ** NEAR my_errmsg[]; extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; extern char *home_dir; /* Home directory for user */ extern char *my_progname; /* program-name (printed in errors) */ @@ -610,6 +607,8 @@ extern int my_error _VARARGS((int nr,myf MyFlags, ...)); extern int my_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...) __attribute__ ((format (printf, 2, 4)))); +extern int my_error_register(const char **errmsgs, int first, int last); +extern const char **my_error_unregister(int first, int last); extern int my_message(uint my_err, const char *str,myf MyFlags); extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags); extern int my_message_curses(uint my_err, const char *str,myf MyFlags); |