mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
9a9e8d2311
---------------------------------------------------------------------- ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0 Bug#32082 : definition of VOID in my_global.h conflicts with Windows SDK headers VOID macro is now removed. Its usage is replaced with void cast. In some cases, where cast does not make much sense (pthread_*, printf, hash_delete, my_seek), cast is ommited. client/mysqladmin.cc: Bug#32082 : remove VOID macro client/mysqldump.c: Bug#32082 : remove VOID macro client/mysqlimport.c: Bug#32082 : remove VOID macro client/mysqlslap.c: Bug#32082 : remove VOID macro client/mysqltest.cc: Bug#32082 : remove VOID macro client/sql_string.cc: Bug#32082 : remove VOID macro extra/comp_err.c: Bug#32082 : remove VOID macro extra/replace.c: Bug#32082 : remove VOID macro include/my_alarm.h: Bug#32082 : remove VOID macro include/my_global.h: Bug#32082 : remove VOID macro libmysql/libmysql.c: Bug#32082 : remove VOID macro mysys/errors.c: Bug#32082 : remove VOID macro mysys/hash.c: Bug#32082 : remove VOID macro mysys/mf_iocache2.c: Bug#32082 : remove VOID macro mysys/mf_loadpath.c: Bug#32082 : remove VOID macro mysys/mf_path.c: Bug#32082 : remove VOID macro mysys/my_append.c: Bug#32082 : remove VOID macro mysys/my_clock.c: Bug#32082 : remove VOID macro mysys/my_copy.c: Bug#32082 : remove VOID macro mysys/my_fstream.c: Bug#32082 : remove VOID macro mysys/my_getwd.c: Bug#32082 : remove VOID macro mysys/my_lib.c: Bug#32082 : remove VOID macro mysys/my_lockmem.c: Bug#32082 : remove VOID macro mysys/my_pthread.c: Bug#32082 : remove VOID macro mysys/my_redel.c: Bug#32082 : remove VOID macro mysys/stacktrace.c: Bug#32082 : remove VOID macro mysys/thr_alarm.c: Bug#32082 : remove VOID macro mysys/thr_lock.c: Bug#32082 : remove VOID macro sql/derror.cc: Bug#32082 : remove VOID macro sql/des_key_file.cc: Bug#32082 : remove VOID macro sql/discover.cc: Bug#32082 : remove VOID macro sql/field.cc: Bug#32082 : remove VOID macro sql/filesort.cc: Bug#32082 : remove VOID macro sql/ha_ndbcluster.cc: Bug#32082 : remove VOID macro sql/ha_partition.cc: Bug#32082 : remove VOID macro sql/handler.cc: Bug#32082 : remove VOID macro sql/hostname.cc: Bug#32082 : remove VOID macro sql/init.cc: Bug#32082 : remove VOID macro sql/item.cc: Bug#32082 : remove VOID macro sql/item_cmpfunc.cc: Bug#32082 : remove VOID macro sql/item_strfunc.cc: Bug#32082 : remove VOID macro sql/lock.cc: Bug#32082 : remove VOID macro sql/log.cc: Bug#32082 : remove VOID macro sql/log_event.cc: Bug#32082 : remove VOID macro sql/mysqld.cc: Bug#32082 : remove VOID macro sql/opt_range.h: Bug#32082 : remove VOID macro sql/protocol.cc: Bug#32082 : remove VOID macro sql/records.cc: Bug#32082 : remove VOID macro sql/sp_head.cc: Bug#32082 : remove VOID macro sql/sp_pcontext.cc: Bug#32082 : remove VOID macro sql/sql_acl.cc: Bug#32082 : remove VOID macro sql/sql_base.cc: Bug#32082 : remove VOID macro sql/sql_cache.cc: Bug#32082 : remove VOID macro sql/sql_connect.cc: Bug#32082 : remove VOID macro sql/sql_db.cc: Bug#32082 : remove VOID macro sql/sql_delete.cc: Bug#32082 : remove VOID macro sql/sql_handler.cc: Bug#32082 : remove VOID macro sql/sql_insert.cc: Bug#32082 : remove VOID macro sql/sql_map.cc: Bug#32082 : remove VOID macro sql/sql_parse.cc: Bug#32082 : remove VOID macro sql/sql_select.cc: Bug#32082 : remove VOID macro sql/sql_servers.cc: Bug#32082 : remove VOID macro sql/sql_show.cc: Bug#32082 : remove VOID macro sql/sql_string.cc: Bug#32082 : remove VOID macro sql/sql_table.cc: Bug#32082 : remove VOID macro sql/sql_test.cc: Bug#32082 : remove VOID macro sql/sql_trigger.cc: Bug#32082 : remove VOID macro sql/sql_update.cc: Bug#32082 : remove VOID macro sql/sql_view.cc: Bug#32082 : remove VOID macro sql/table.cc: Bug#32082 : remove VOID macro sql/tztime.cc: Bug#32082 : remove VOID macro sql/udf_example.c: Bug#32082 : remove VOID macro sql/uniques.cc: Bug#32082 : remove VOID macro sql/unireg.cc: Bug#32082 : remove VOID macro storage/archive/ha_archive.cc: Bug#32082 : remove VOID macro storage/blackhole/ha_blackhole.cc: Bug#32082 : remove VOID macro storage/csv/ha_tina.cc: Bug#32082 : remove VOID macro storage/csv/transparent_file.cc: Bug#32082 : remove VOID macro storage/example/ha_example.cc: Bug#32082 : remove VOID macro storage/federated/ha_federated.cc: Bug#32082 : remove VOID macro storage/heap/hp_clear.c: Bug#32082 : remove VOID macro storage/heap/hp_create.c: Bug#32082 : remove VOID macro storage/heap/hp_test1.c: Bug#32082 : remove VOID macro storage/heap/hp_test2.c: Bug#32082 : remove VOID macro storage/innobase/handler/ha_innodb.cc: Bug#32082 : remove VOID macro storage/myisam/ft_eval.c: Bug#32082 : remove VOID macro storage/myisam/ha_myisam.cc: Bug#32082 : remove VOID macro storage/myisam/mi_changed.c: Bug#32082 : remove VOID macro storage/myisam/mi_check.c: Bug#32082 : remove VOID macro storage/myisam/mi_close.c: Bug#32082 : remove VOID macro storage/myisam/mi_create.c: Bug#32082 : remove VOID macro storage/myisam/mi_dbug.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete_all.c: Bug#32082 : remove VOID macro storage/myisam/mi_dynrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_info.c: Bug#32082 : remove VOID macro storage/myisam/mi_locking.c: Bug#32082 : remove VOID macro storage/myisam/mi_log.c: Bug#32082 : remove VOID macro storage/myisam/mi_open.c: Bug#32082 : remove VOID macro storage/myisam/mi_packrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_panic.c: Bug#32082 : remove VOID macro storage/myisam/mi_rsame.c: Bug#32082 : remove VOID macro storage/myisam/mi_statrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_test1.c: Bug#32082 : remove VOID macro storage/myisam/mi_test2.c: Bug#32082 : remove VOID macro storage/myisam/mi_test3.c: Bug#32082 : remove VOID macro storage/myisam/mi_update.c: Bug#32082 : remove VOID macro storage/myisam/mi_write.c: Bug#32082 : remove VOID macro storage/myisam/myisamchk.c: Bug#32082 : remove VOID macro storage/myisam/myisamlog.c: Bug#32082 : remove VOID macro storage/myisam/myisampack.c: Bug#32082 : remove VOID macro storage/myisam/sort.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_close.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_create.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_open.c: Bug#32082 : remove VOID macro strings/str_test.c: Bug#32082 : remove VOID macro tests/thread_test.c: Bug#32082 : remove VOID macro
220 lines
6.1 KiB
C++
220 lines
6.1 KiB
C++
/* Copyright (C) 2000-2005 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
|
|
/**
|
|
@file
|
|
|
|
@brief
|
|
Read language depeneded messagefile
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "mysys_err.h"
|
|
|
|
static void init_myfunc_errs(void);
|
|
|
|
|
|
const char **get_server_errmsgs()
|
|
{
|
|
return CURRENT_THD_ERRMSGS;
|
|
}
|
|
|
|
|
|
/**
|
|
Read messages from errorfile.
|
|
|
|
This function can be called multiple times to reload the messages.
|
|
If it fails to load the messages, it will fail softly by initializing
|
|
the errmesg pointer to an array of empty strings or by keeping the
|
|
old array if it exists.
|
|
|
|
@retval
|
|
FALSE OK
|
|
@retval
|
|
TRUE Error
|
|
*/
|
|
|
|
bool init_errmessage(void)
|
|
{
|
|
const char **errmsgs, **ptr;
|
|
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, my_default_lc_messages->errmsgs->language,
|
|
&errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1) &&
|
|
!errmsgs)
|
|
{
|
|
if (!(errmsgs= (const char**) my_malloc((ER_ERROR_LAST-ER_ERROR_FIRST+1)*
|
|
sizeof(char*), MYF(0))))
|
|
DBUG_RETURN(TRUE);
|
|
for (ptr= errmsgs; ptr < errmsgs + ER_ERROR_LAST - ER_ERROR_FIRST; ptr++)
|
|
*ptr= "";
|
|
}
|
|
|
|
/* Register messages for use with my_error(). */
|
|
if (my_error_register(get_server_errmsgs, ER_ERROR_FIRST, ER_ERROR_LAST))
|
|
{
|
|
x_free((uchar*) errmsgs);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
DEFAULT_ERRMSGS= errmsgs; /* Init global variable */
|
|
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.
|
|
*/
|
|
|
|
bool read_texts(const char *file_name, const char *language,
|
|
const char ***point, uint error_messages)
|
|
{
|
|
register uint i;
|
|
uint count,funktpos,textcount;
|
|
size_t length;
|
|
File file;
|
|
char name[FN_REFLEN];
|
|
char lang_path[FN_REFLEN];
|
|
uchar *buff;
|
|
uchar head[32],*pos;
|
|
const char *errmsg;
|
|
DBUG_ENTER("read_texts");
|
|
|
|
LINT_INIT(buff);
|
|
funktpos=0;
|
|
convert_dirname(lang_path, language, NullS);
|
|
(void) my_load_path(lang_path, lang_path, lc_messages_dir);
|
|
if ((file=my_open(fn_format(name,file_name,
|
|
lang_path, "", 4),
|
|
O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) < 0)
|
|
{
|
|
/*
|
|
Trying pre-5.4 sematics of the --language parameter.
|
|
It included the language-specific part, e.g.:
|
|
|
|
--language=/path/to/english/
|
|
*/
|
|
if ((file= my_open(fn_format(name, file_name, lc_messages_dir, "", 4),
|
|
O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) < 0)
|
|
goto err;
|
|
sql_print_error("An old style --language value with language specific part detected: %s", lc_messages_dir);
|
|
sql_print_error("Use --lc-messages-dir without language specific part instead.");
|
|
}
|
|
|
|
funktpos=1;
|
|
if (my_read(file,(uchar*) 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];
|
|
|
|
error_message_charset_info= system_charset_info;
|
|
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));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
x_free((uchar*) *point); /* Free old language */
|
|
if (!(*point= (const char**)
|
|
my_malloc((size_t) (length+count*sizeof(char*)),MYF(0))))
|
|
{
|
|
funktpos=2; /* purecov: inspected */
|
|
goto err; /* purecov: inspected */
|
|
}
|
|
buff= (uchar*) (*point + count);
|
|
|
|
if (my_read(file, buff, (size_t) count*2,MYF(MY_NABP)))
|
|
goto err;
|
|
for (i=0, pos= buff ; i< count ; i++)
|
|
{
|
|
(*point)[i]= (char*) buff+uint2korr(pos);
|
|
pos+=2;
|
|
}
|
|
if (my_read(file, buff, 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:
|
|
errmsg= "Not enough memory for messagefile '%s'";
|
|
break;
|
|
case 1:
|
|
errmsg= "Can't read from messagefile '%s'";
|
|
break;
|
|
default:
|
|
errmsg= "Can't find messagefile '%s'";
|
|
break;
|
|
}
|
|
sql_print_error(errmsg, name);
|
|
if (file != FERR)
|
|
(void) my_close(file,MYF(MY_WME));
|
|
DBUG_RETURN(1);
|
|
} /* 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);
|
|
}
|
|
}
|