mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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.
195 lines
5.5 KiB
C++
195 lines
5.5 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
|
|
/* Read language depeneded messagefile */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "mysys_err.h"
|
|
|
|
static bool read_texts(const char *file_name,const char ***point,
|
|
uint error_messages);
|
|
static void init_myfunc_errs(void);
|
|
|
|
/*
|
|
Read messages from errorfile.
|
|
|
|
SYNOPSIS
|
|
init_errmessage()
|
|
|
|
DESCRIPTION
|
|
This function can be called multiple times to reload the messages.
|
|
|
|
RETURN
|
|
FALSE OK
|
|
TRUE Error
|
|
*/
|
|
|
|
bool init_errmessage(void)
|
|
{
|
|
const char **errmsgs;
|
|
DBUG_ENTER("init_errmessage");
|
|
|
|
/*
|
|
Get a pointer to the old error messages pointer array.
|
|
read_texts() tries to free it.
|
|
*/
|
|
errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST);
|
|
|
|
/* Read messages from file. */
|
|
if (read_texts(ERRMSG_FILE, &errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
/* Register messages for use with my_error(). */
|
|
if (my_error_register(errmsgs, ER_ERROR_FIRST, ER_ERROR_LAST))
|
|
{
|
|
x_free((gptr) errmsgs);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
errmesg= errmsgs; /* Init global variabel */
|
|
init_myfunc_errs(); /* Init myfunc messages */
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/* Read text from packed textfile in language-directory */
|
|
/* If we can't read messagefile then it's panic- we can't continue */
|
|
|
|
static bool read_texts(const char *file_name,const char ***point,
|
|
uint error_messages)
|
|
{
|
|
register uint i;
|
|
uint count,funktpos,length,textcount;
|
|
File file;
|
|
char name[FN_REFLEN];
|
|
const char *buff;
|
|
uchar head[32],*pos;
|
|
CHARSET_INFO *cset; // For future
|
|
DBUG_ENTER("read_texts");
|
|
|
|
*point=0; // If something goes wrong
|
|
LINT_INIT(buff);
|
|
funktpos=0;
|
|
if ((file=my_open(fn_format(name,file_name,language,"",4),
|
|
O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) < 0)
|
|
goto err; /* purecov: inspected */
|
|
|
|
funktpos=1;
|
|
if (my_read(file,(byte*) head,32,MYF(MY_NABP))) goto err;
|
|
if (head[0] != (uchar) 254 || head[1] != (uchar) 254 ||
|
|
head[2] != 2 || head[3] != 1)
|
|
goto err; /* purecov: inspected */
|
|
textcount=head[4];
|
|
|
|
if (!head[30])
|
|
{
|
|
sql_print_error("Character set information not found in '%s'. \
|
|
Please install the latest version of this file.",name);
|
|
goto err1;
|
|
}
|
|
|
|
/* TODO: Convert the character set to server system character set */
|
|
if (!(cset= get_charset(head[30],MYF(MY_WME))))
|
|
{
|
|
sql_print_error("Character set #%d is not supported for messagefile '%s'",
|
|
(int)head[30],name);
|
|
goto err1;
|
|
}
|
|
|
|
length=uint2korr(head+6); count=uint2korr(head+8);
|
|
|
|
if (count < error_messages)
|
|
{
|
|
sql_print_error("\
|
|
Error message file '%s' had only %d error messages,\n\
|
|
but it should contain at least %d error messages.\n\
|
|
Check that the above file is the right version for this program!",
|
|
name,count,error_messages);
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
unireg_abort(1);
|
|
}
|
|
|
|
x_free((gptr) *point); /* Free old language */
|
|
if (!(*point= (const char**)
|
|
my_malloc((uint) (length+count*sizeof(char*)),MYF(0))))
|
|
{
|
|
funktpos=2; /* purecov: inspected */
|
|
goto err; /* purecov: inspected */
|
|
}
|
|
buff= (char*) (*point + count);
|
|
|
|
if (my_read(file,(byte*) buff,(uint) count*2,MYF(MY_NABP))) goto err;
|
|
for (i=0, pos= (uchar*) buff ; i< count ; i++)
|
|
{
|
|
(*point)[i]=buff+uint2korr(pos);
|
|
pos+=2;
|
|
}
|
|
if (my_read(file,(byte*) buff,(uint) length,MYF(MY_NABP))) goto err;
|
|
|
|
for (i=1 ; i < textcount ; i++)
|
|
{
|
|
point[i]= *point +uint2korr(head+10+i+i);
|
|
}
|
|
VOID(my_close(file,MYF(0)));
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
switch (funktpos) {
|
|
case 2:
|
|
buff="Not enough memory for messagefile '%s'";
|
|
break;
|
|
case 1:
|
|
buff="Can't read from messagefile '%s'";
|
|
break;
|
|
default:
|
|
buff="Can't find messagefile '%s'";
|
|
break;
|
|
}
|
|
sql_print_error(buff,name);
|
|
err1:
|
|
if (file != FERR)
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
unireg_abort(1);
|
|
DBUG_RETURN(1); // keep compiler happy
|
|
} /* read_texts */
|
|
|
|
|
|
/* Initiates error-messages used by my_func-library */
|
|
|
|
static void init_myfunc_errs()
|
|
{
|
|
init_glob_errs(); /* Initiate english errors */
|
|
if (!(specialflag & SPECIAL_ENGLISH))
|
|
{
|
|
EE(EE_FILENOTFOUND) = ER(ER_FILE_NOT_FOUND);
|
|
EE(EE_CANTCREATEFILE) = ER(ER_CANT_CREATE_FILE);
|
|
EE(EE_READ) = ER(ER_ERROR_ON_READ);
|
|
EE(EE_WRITE) = ER(ER_ERROR_ON_WRITE);
|
|
EE(EE_BADCLOSE) = ER(ER_ERROR_ON_CLOSE);
|
|
EE(EE_OUTOFMEMORY) = ER(ER_OUTOFMEMORY);
|
|
EE(EE_DELETE) = ER(ER_CANT_DELETE_FILE);
|
|
EE(EE_LINK) = ER(ER_ERROR_ON_RENAME);
|
|
EE(EE_EOFERR) = ER(ER_UNEXPECTED_EOF);
|
|
EE(EE_CANTLOCK) = ER(ER_CANT_LOCK);
|
|
EE(EE_DIR) = ER(ER_CANT_READ_DIR);
|
|
EE(EE_STAT) = ER(ER_CANT_GET_STAT);
|
|
EE(EE_GETWD) = ER(ER_CANT_GET_WD);
|
|
EE(EE_SETWD) = ER(ER_CANT_SET_WD);
|
|
EE(EE_DISK_FULL) = ER(ER_DISK_FULL);
|
|
}
|
|
}
|