mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
bbab9ec678
Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge
93 lines
4.1 KiB
C
93 lines
4.1 KiB
C
/* Copyright (C) 2000 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; 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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
|
|
#ifndef SHARED_LIBRARY
|
|
|
|
const char * NEAR globerrs[GLOBERRS]=
|
|
{
|
|
"File '%s' not found (Errcode: %d)",
|
|
"Can't create/write to file '%s' (Errcode: %d)",
|
|
"Error reading file '%s' (Errcode: %d)",
|
|
"Error writing file '%s' (Errcode: %d)",
|
|
"Error on close of '%s' (Errcode: %d)",
|
|
"Out of memory (Needed %u bytes)",
|
|
"Error on delete of '%s' (Errcode: %d)",
|
|
"Error on rename of '%s' to '%s' (Errcode: %d)",
|
|
"",
|
|
"Unexpected eof found when reading file '%s' (Errcode: %d)",
|
|
"Can't lock file (Errcode: %d)",
|
|
"Can't unlock file (Errcode: %d)",
|
|
"Can't read dir of '%s' (Errcode: %d)",
|
|
"Can't get stat of '%s' (Errcode: %d)",
|
|
"Can't change size of file (Errcode: %d)",
|
|
"Can't open stream from handle (Errcode: %d)",
|
|
"Can't get working dirctory (Errcode: %d)",
|
|
"Can't change dir to '%s' (Errcode: %d)",
|
|
"Warning: '%s' had %d links",
|
|
"%d files and %d streams is left open\n",
|
|
"Disk is full writing '%s' (Errcode: %d). Waiting for someone to free space... Retry in %d secs",
|
|
"Can't create directory '%s' (Errcode: %d)",
|
|
"Character set '%s' is not a compiled character set and is not specified in the '%s' file",
|
|
"Out of resources when opening file '%s' (Errcode: %d)",
|
|
"Can't read value for symlink '%s' (Error %d)",
|
|
"Can't create symlink '%s' pointing at '%s' (Error %d)",
|
|
"Error on realpath() on '%s' (Error %d)",
|
|
"Can't sync file '%s' to disk (Errcode: %d)",
|
|
};
|
|
|
|
void init_glob_errs(void)
|
|
{
|
|
my_errmsg[GLOB] = & globerrs[0];
|
|
} /* init_glob_errs */
|
|
|
|
#else
|
|
|
|
void init_glob_errs()
|
|
{
|
|
my_errmsg[GLOB] = & globerrs[0];
|
|
|
|
EE(EE_FILENOTFOUND) = "File '%s' not found (Errcode: %d)";
|
|
EE(EE_CANTCREATEFILE) = "Can't create/write to file '%s' (Errcode: %d)";
|
|
EE(EE_READ) = "Error reading file '%s' (Errcode: %d)";
|
|
EE(EE_WRITE) = "Error writing file '%s' (Errcode: %d)";
|
|
EE(EE_BADCLOSE) = "Error on close of '%'s (Errcode: %d)";
|
|
EE(EE_OUTOFMEMORY) = "Out of memory (Needed %u bytes)";
|
|
EE(EE_DELETE) = "Error on delete of '%s' (Errcode: %d)";
|
|
EE(EE_LINK) = "Error on rename of '%s' to '%s' (Errcode: %d)";
|
|
EE(EE_EOFERR) = "Unexpected eof found when reading file '%s' (Errcode: %d)";
|
|
EE(EE_CANTLOCK) = "Can't lock file (Errcode: %d)";
|
|
EE(EE_CANTUNLOCK) = "Can't unlock file (Errcode: %d)";
|
|
EE(EE_DIR) = "Can't read dir of '%s' (Errcode: %d)";
|
|
EE(EE_STAT) = "Can't get stat of '%s' (Errcode: %d)";
|
|
EE(EE_CANT_CHSIZE) = "Can't change size of file (Errcode: %d)";
|
|
EE(EE_CANT_OPEN_STREAM)= "Can't open stream from handle (Errcode: %d)";
|
|
EE(EE_GETWD) = "Can't get working dirctory (Errcode: %d)";
|
|
EE(EE_SETWD) = "Can't change dir to '%s' (Errcode: %d)";
|
|
EE(EE_LINK_WARNING) = "Warning: '%s' had %d links";
|
|
EE(EE_OPEN_WARNING) = "%d files and %d streams is left open\n";
|
|
EE(EE_DISK_FULL) = "Disk is full writing '%s'. Waiting for someone to free space...";
|
|
EE(EE_CANT_MKDIR) ="Can't create directory '%s' (Errcode: %d)";
|
|
EE(EE_UNKNOWN_CHARSET)= "Character set '%s' is not a compiled character set and is not specified in the %s file";
|
|
EE(EE_OUT_OF_FILERESOURCES)="Out of resources when opening file '%s' (Errcode: %d)";
|
|
EE(EE_CANT_READLINK)= "Can't read value for symlink '%s' (Error %d)";
|
|
EE(EE_CANT_SYMLINK)= "Can't create symlink '%s' pointing at '%s' (Error %d)";
|
|
EE(EE_REALPATH)= "Error on realpath() on '%s' (Error %d)";
|
|
EE(EE_SYNC)= "Can't sync file '%s' to disk (Errcode: %d)";
|
|
}
|
|
#endif
|