mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
265 lines
8 KiB
C++
265 lines
8 KiB
C++
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
|
|
Copyright (C) 2011 Monty Program 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/**
|
|
@file
|
|
|
|
@brief
|
|
Read language depeneded messagefile
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include "sql_priv.h"
|
|
#include "unireg.h"
|
|
#include "derror.h"
|
|
#include "mysys_err.h"
|
|
#include "mysqld.h" // lc_messages_dir
|
|
#include "derror.h" // read_texts
|
|
#include "sql_class.h" // THD
|
|
|
|
static bool check_error_mesg(const char *file_name, const char **errmsg);
|
|
static void init_myfunc_errs(void);
|
|
|
|
|
|
C_MODE_START
|
|
static const char **get_server_errmsgs()
|
|
{
|
|
if (!current_thd)
|
|
return DEFAULT_ERRMSGS;
|
|
return CURRENT_THD_ERRMSGS;
|
|
}
|
|
C_MODE_END
|
|
|
|
/**
|
|
Read messages from errorfile.
|
|
|
|
This function can be called multiple times to reload the messages.
|
|
|
|
If it fails to load the messages:
|
|
- If we already have error messages loaded, keep the old ones and
|
|
return FALSE(ok)
|
|
- Initializing the errmesg pointer to an array of empty strings
|
|
and return TRUE (error)
|
|
|
|
@retval
|
|
FALSE OK
|
|
@retval
|
|
TRUE Error
|
|
*/
|
|
|
|
bool init_errmessage(void)
|
|
{
|
|
const char **errmsgs, **ptr, **org_errmsgs;
|
|
bool error= FALSE;
|
|
DBUG_ENTER("init_errmessage");
|
|
|
|
/*
|
|
Get a pointer to the old error messages pointer array.
|
|
read_texts() tries to free it.
|
|
*/
|
|
org_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)
|
|
{
|
|
my_free(errmsgs);
|
|
|
|
if (org_errmsgs)
|
|
{
|
|
/* Use old error messages */
|
|
errmsgs= org_errmsgs;
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
No error messages. Create a temporary empty error message so
|
|
that we don't get a crash if some code wrongly tries to access
|
|
a non existing error message.
|
|
*/
|
|
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= "";
|
|
error= TRUE;
|
|
}
|
|
}
|
|
else
|
|
my_free(org_errmsgs); // Free old language
|
|
|
|
/* Register messages for use with my_error(). */
|
|
if (my_error_register(get_server_errmsgs, ER_ERROR_FIRST, ER_ERROR_LAST))
|
|
{
|
|
my_free(errmsgs);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
DEFAULT_ERRMSGS= errmsgs; /* Init global variable */
|
|
init_myfunc_errs(); /* Init myfunc messages */
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/**
|
|
Check the error messages array contains all relevant error messages
|
|
*/
|
|
|
|
static bool check_error_mesg(const char *file_name, const char **errmsg)
|
|
{
|
|
/*
|
|
The last MySQL error message can't be an empty string; If it is,
|
|
it means that the error file doesn't contain all MySQL messages
|
|
and is probably from an older version of MySQL / MariaDB.
|
|
*/
|
|
if (errmsg[ER_LAST_MYSQL_ERROR_MESSAGE -1 - ER_ERROR_FIRST][0] == 0)
|
|
{
|
|
sql_print_error("Error message file '%s' is probably from and older "
|
|
"version of MariaDB / MYSQL as it doesn't contain all "
|
|
"error messages", file_name);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/**
|
|
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;
|
|
size_t offset, length;
|
|
File file;
|
|
char name[FN_REFLEN];
|
|
char lang_path[FN_REFLEN];
|
|
uchar *buff;
|
|
uchar head[32],*pos;
|
|
DBUG_ENTER("read_texts");
|
|
|
|
*point= 0;
|
|
|
|
LINT_INIT(buff);
|
|
funktpos=0;
|
|
convert_dirname(lang_path, language, NullS);
|
|
(void) my_load_path(lang_path, lang_path, lc_messages_dir);
|
|
if ((file= mysql_file_open(key_file_ERRMSG,
|
|
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= mysql_file_open(key_file_ERRMSG,
|
|
fn_format(name, file_name, lc_messages_dir, "", 4),
|
|
O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) < 0)
|
|
goto err;
|
|
sql_print_warning("An old style --language or -lc-message-dir value with language specific part detected: %s", lc_messages_dir);
|
|
sql_print_warning("Use --lc-messages-dir without language specific part instead.");
|
|
}
|
|
|
|
funktpos=1;
|
|
if (mysql_file_read(file, (uchar*) head, 32, MYF(MY_NABP)))
|
|
goto err;
|
|
funktpos=2;
|
|
if (head[0] != (uchar) 254 || head[1] != (uchar) 254 ||
|
|
head[2] != 2 || head[3] != 3)
|
|
goto err; /* purecov: inspected */
|
|
|
|
error_message_charset_info= system_charset_info;
|
|
length=uint4korr(head+6); count=uint2korr(head+10);
|
|
|
|
if (count < error_messages)
|
|
{
|
|
sql_print_error("\
|
|
Error message file '%s' had only %d error messages, but it should contain at least %d error messages.\nCheck that the above file is the right version for this program!",
|
|
name,count,error_messages);
|
|
(void) mysql_file_close(file, MYF(MY_WME));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (!(*point= (const char**)
|
|
my_malloc((size_t) (MY_MAX(length,count*2)+count*sizeof(char*)),MYF(0))))
|
|
{
|
|
funktpos=3; /* purecov: inspected */
|
|
goto err; /* purecov: inspected */
|
|
}
|
|
buff= (uchar*) (*point + count);
|
|
|
|
if (mysql_file_read(file, buff, (size_t) count*2, MYF(MY_NABP)))
|
|
goto err;
|
|
for (i=0, offset=0, pos= buff ; i< count ; i++)
|
|
{
|
|
(*point)[i]= (char*) buff+offset;
|
|
offset+= uint2korr(pos);
|
|
pos+=2;
|
|
}
|
|
if (mysql_file_read(file, buff, length, MYF(MY_NABP)))
|
|
goto err;
|
|
|
|
(void) mysql_file_close(file, MYF(0));
|
|
|
|
i= check_error_mesg(file_name, *point);
|
|
DBUG_RETURN(i);
|
|
|
|
err:
|
|
sql_print_error((funktpos == 3) ? "Not enough memory for messagefile '%s'" :
|
|
(funktpos == 2) ? "Incompatible header in messagefile '%s'. Probably from another version of MariaDB" :
|
|
((funktpos == 1) ? "Can't read from messagefile '%s'" :
|
|
"Can't find messagefile '%s'"), name);
|
|
if (file != FERR)
|
|
(void) mysql_file_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);
|
|
}
|
|
}
|