mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
066c90563a
net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed (WL#2133) include/mysqld_error.h: new errors added. mysql-test/r/rpl_charset.result: new error mysql-test/r/rpl_timezone.result: new error mysql-test/r/sp-security.result: more clean error message mysql-test/r/sp.result: now error state intercepted correctly mysql-test/t/connect.test: new error message mysql-test/t/rpl_charset.test: new error message mysql-test/t/rpl_timezone.test: new error mysql-test/t/sp-security.test: more correct error handling mysql-test/t/sp.test: now error state intercepted correctly sql/ha_innodb.cc: -1/1 (sent/unsent) error reporting removed sql/ha_innodb.h: -1/1 (sent/unsent) error reporting removed sql/item.cc: only boolean values should be returned by fix_fields() sql/item_cmpfunc.cc: only boolean values should be returned by fix_fields() sql/item_func.cc: only boolean values should be returned by fix_fields() net_printf/send_error calls replaced by my_error family functions sql/item_row.cc: only boolean values should be returned by fix_fields() sql/item_subselect.cc: only boolean values should be returned by fix_fields() -1/1 (sent/unsent) error reporting removed sql/item_subselect.h: -1/1 (sent/unsent) error reporting removed sql/item_sum.cc: only boolean values should be returned by fix_fields() sql/item_timefunc.cc: only boolean values should be returned by fix_fields() sql/item_uniq.h: only boolean values should be returned by fix_fields() sql/mysql_priv.h: -1/1 (sent/unsent) error reporting removed sql/mysqld.cc: net_printf/send_error calls replaced by my_error family functions changes in my_message_sql to support error handling correctly sql/protocol.cc: net_printf/send_error calls replaced by my_error family functions sql/protocol_cursor.cc: net_printf/send_error calls replaced by my_error family functions sql/repl_failsafe.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/repl_failsafe.h: -1/1 (sent/unsent) error reporting removed sql/set_var.cc: net_printf/send_error calls replaced by my_error family functions sql/share/czech/errmsg.txt: new error messages sql/share/danish/errmsg.txt: new error messages sql/share/dutch/errmsg.txt: new error messages sql/share/english/errmsg.txt: new error messages sql/share/estonian/errmsg.txt: new error messages sql/share/french/errmsg.txt: new error messages sql/share/german/errmsg.txt: new error messages sql/share/greek/errmsg.txt: new error messages sql/share/hungarian/errmsg.txt: new error messages sql/share/italian/errmsg.txt: new error messages sql/share/japanese/errmsg.txt: new error messages sql/share/korean/errmsg.txt: new error messages sql/share/norwegian-ny/errmsg.txt: new error messages sql/share/norwegian/errmsg.txt: new error messages sql/share/polish/errmsg.txt: new error messages sql/share/portuguese/errmsg.txt: new error messages sql/share/romanian/errmsg.txt: new error messages sql/share/russian/errmsg.txt: new error messages sql/share/serbian/errmsg.txt: new error messages sql/share/slovak/errmsg.txt: new error messages sql/share/spanish/errmsg.txt: new error messages sql/share/swedish/errmsg.txt: new error messages sql/share/ukrainian/errmsg.txt: new error messages sql/slave.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/slave.h: -1/1 (sent/unsent) error reporting removed sql/sp.cc: net_printf/send_error calls replaced by my_error family functions sql/sp_head.cc: new eror handling support net_printf/send_error calls replaced by my_error family functions sql/sp_rcontext.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_acl.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_acl.h: -1/1 (sent/unsent) error reporting removed sql/sql_base.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_class.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_class.h: my_messhage_sql now set/reset query_error flag sql/sql_db.cc: -1/1 (sent/unsent) error reporting removed sql/sql_delete.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_do.cc: -1/1 (sent/unsent) error reporting removed sql/sql_error.cc: -1/1 (sent/unsent) error reporting removed sql/sql_handler.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_help.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_insert.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_lex.h: -1/1 (sent/unsent) error reporting removed sql/sql_load.cc: -1/1 (sent/unsent) error reporting removed sql/sql_map.cc: errors without code removed sql/sql_parse.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed from mysql_execute_command sql/sql_prepare.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_repl.cc: error messages fixed net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_repl.h: -1/1 (sent/unsent) error reporting removed sql/sql_select.cc: -1/1 (sent/unsent) error reporting removed sql/sql_select.h: -1/1 (sent/unsent) error reporting removed sql/sql_show.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_table.cc: net_printf/send_error calls replaced by my_error family functions -1/1 (sent/unsent) error reporting removed sql/sql_trigger.cc: -1/1 (sent/unsent) error reporting removed sql/sql_udf.cc: net_printf/send_error calls replaced by my_error family functions sql/sql_union.cc: -1/1 (sent/unsent) error reporting removed sql/sql_update.cc: -1/1 (sent/unsent) error reporting removed net_printf/send_error calls replaced by my_error family functions sql/sql_view.cc: -1/1 (sent/unsent) error reporting removed sql/sql_view.h: -1/1 (sent/unsent) error reporting removed sql/sql_yacc.yy: net_printf/send_error calls replaced by my_error family functions
145 lines
3.4 KiB
C++
145 lines
3.4 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 */
|
|
|
|
|
|
#ifdef __GNUC__
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#include "mysql_priv.h"
|
|
#ifdef HAVE_MMAP
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
#ifndef MAP_NORESERVE
|
|
#define MAP_NORESERVE 0 // For IRIX
|
|
#endif
|
|
|
|
mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_length)
|
|
{
|
|
#ifdef HAVE_MMAP
|
|
name=my_strdup(filename,MYF(0));
|
|
use_count=1;
|
|
error=0;
|
|
map=0;
|
|
size=0;
|
|
if ((file=my_open(name,O_RDONLY,MYF(MY_WME))) >= 0)
|
|
{
|
|
struct stat stat_buf;
|
|
if (!fstat(file,&stat_buf))
|
|
{
|
|
if (!(map=(byte*) mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,
|
|
MAP_SHARED | MAP_NORESERVE,file,
|
|
0L)))
|
|
{
|
|
error=errno;
|
|
my_error(ER_NO_FILE_MAPPING,MYF(0), (my_string) name, error);
|
|
}
|
|
}
|
|
if (map && memcmp(map,magic,magic_length))
|
|
{
|
|
my_error(ER_WRONG_MAGIC, MYF(0), name);
|
|
VOID(munmap(map,size));
|
|
map=0;
|
|
}
|
|
if (!map)
|
|
{
|
|
VOID(my_close(file,MYF(0)));
|
|
file= -1;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
|
|
mapped_files::~mapped_files()
|
|
{
|
|
#ifdef HAVE_MMAP
|
|
if (file >= 0)
|
|
{
|
|
VOID(munmap((caddr_t) map,size));
|
|
VOID(my_close(file,MYF(0)));
|
|
file= -1; map=0;
|
|
}
|
|
my_free(name,MYF(0));
|
|
#endif
|
|
}
|
|
|
|
|
|
static I_List<mapped_files> maps_in_use;
|
|
|
|
/*
|
|
** Check if a file is mapped. If it is, then return pointer to old map,
|
|
** else alloc new object
|
|
*/
|
|
|
|
mapped_files *map_file(const my_string name,byte *magic,uint magic_length)
|
|
{
|
|
#ifdef HAVE_MMAP
|
|
VOID(pthread_mutex_lock(&LOCK_mapped_file));
|
|
I_List_iterator<mapped_files> list(maps_in_use);
|
|
mapped_files *map;
|
|
char path[FN_REFLEN];
|
|
sprintf(path,"%s/%s/%s.uniq",mysql_data_home,current_thd->db,name);
|
|
(void) unpack_filename(path,path);
|
|
|
|
while ((map=list++))
|
|
{
|
|
if (!strcmp(path,map->name))
|
|
break;
|
|
}
|
|
if (!map)
|
|
{
|
|
map=new mapped_files(path,magic,magic_length);
|
|
maps_in_use.append(map);
|
|
}
|
|
else
|
|
{
|
|
map->use_count++;
|
|
if (!map->map)
|
|
my_error(ER_NO_FILE_MAPPING, MYF(0), path, map->error);
|
|
}
|
|
VOID(pthread_mutex_unlock(&LOCK_mapped_file));
|
|
return map;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** free the map if there are no more users for it
|
|
*/
|
|
|
|
void unmap_file(mapped_files *map)
|
|
{
|
|
#ifdef HAVE_MMAP
|
|
VOID(pthread_mutex_lock(&LOCK_mapped_file));
|
|
if (!map->use_count--)
|
|
delete map;
|
|
VOID(pthread_mutex_unlock(&LOCK_mapped_file));
|
|
#endif
|
|
}
|
|
|
|
/*****************************************************************************
|
|
** Instansiate templates
|
|
*****************************************************************************/
|
|
|
|
#ifdef __GNUC__
|
|
/* Used templates */
|
|
template class I_List<mapped_files>;
|
|
template class I_List_iterator<mapped_files>;
|
|
#endif
|