mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
f4fee3d90e
Fixes for building MySQL with gcc 3.0 Added SIGNED / UNSIGNED casts Fixed core dump bug in net_clear() with libmysqld. Back to using semaphores in query cache. Added 'Null' and 'Index_type' to SHOW INDEX. BUILD/FINISH.sh: Fixes for gcc 3.0 BUILD/SETUP.sh: Fixes for gcc 3.0 Docs/manual.texi: Changelog + SIGNED/UNSIGNED casts. Makefile.am: include BUILD scripts in source distribution. client/Makefile.am: Fixes for gcc 3.0 client/mysql.cc: Cleanup client/mysqldump.c: Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys' client/readline.cc: Cleanup configure.in: Include BUILD in source distrbution extra/my_print_defaults.c: Cleanup include/my_global.h: Fix for HPUX and setrlimit. Portability fix. Added macros for nice TIMESPEC usage. innobase/include/dyn0dyn.h: Fix for AIX libmysql/Makefile.shared: Added strxmov to libmysqld libmysqld/examples/Makefile.am: Fixes for gcc 3.0 libmysqld/lib_vio.c: Cleanup myisam/ft_dump.c: Portability fixes myisam/ftdefs.h: Portability fixes mysql-test/r/bdb.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/bigint.result: New test for SIGNED/UNSIGNED mysql-test/r/fulltext.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/heap.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/innodb.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/isam.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/key.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/myisam.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/query_cache.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/select.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/show_check.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/r/type_ranges.result: Cleanup results after adding 2 columns to SHOW KEYS mysql-test/t/bigint.test: New test for SIGNED/UNSIGNED mysql-test/t/key.test: New test for SIGNED/UNSIGNED mysql-test/t/query_cache.test: Test for FOUND_ROWS() sql-bench/crash-me.sh: Safety fixes sql/derror.cc: Cleanup sql/ha_berkeley.h: New test for SIGNED/UNSIGNED sql/ha_heap.h: New test for SIGNED/UNSIGNED sql/ha_innobase.cc: New test for SIGNED/UNSIGNED sql/ha_innobase.h: New test for SIGNED/UNSIGNED sql/ha_isam.h: New test for SIGNED/UNSIGNED sql/ha_myisam.cc: New test for SIGNED/UNSIGNED sql/ha_myisam.h: New test for SIGNED/UNSIGNED sql/handler.h: New test for SIGNED/UNSIGNED sql/item_func.cc: Cleanup TIMESPEC usage sql/item_func.h: Added SIGNED / UNSIGNED casts sql/lex.h: Added SIGNED / UNSIGNED casts sql/mysqld.cc: Cleanup TIMESPEC usage sql/net_pkg.cc: Cleanup sql/net_serv.cc: Fixed core dump bug in net_clear() sql/slave.cc: Cleanup sql/sql_cache.cc: Back to using semaphores sql/sql_cache.h: Back to using semaphores sql/sql_insert.cc: Cleanup TIMESPEC usage sql/sql_manager.cc: Cleanup TIMESPEC usage sql/sql_parse.cc: Cleanup sql/sql_repl.cc: Cleanup TIMESPEC usage sql/sql_show.cc: Added 'Null' and 'Index_type' to SHOW INDEX. sql/sql_table.cc: Sort keys in table in a more logical order. sql/sql_yacc.yy: Support for SIGNED/UNSIGNED casts.
147 lines
4.5 KiB
C++
147 lines
4.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 void read_texts(const char *file_name,const char ***point,
|
|
uint error_messages);
|
|
static void init_myfunc_errs(void);
|
|
|
|
/* Read messages from errorfile */
|
|
|
|
void init_errmessage(void)
|
|
{
|
|
DBUG_ENTER("init_errmessage");
|
|
|
|
read_texts(ERRMSG_FILE,&my_errmsg[ERRMAPP],ER_ERROR_MESSAGES);
|
|
errmesg=my_errmsg[ERRMAPP]; /* Init global variabel */
|
|
init_myfunc_errs(); /* Init myfunc messages */
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Read text from packed textfile in language-directory */
|
|
/* If we can't read messagefile then it's panic- we can't continue */
|
|
|
|
static void 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;
|
|
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];
|
|
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_VOID_RETURN;
|
|
|
|
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;
|
|
}
|
|
if (file != FERR)
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
sql_print_error(buff,name);
|
|
unireg_abort(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))
|
|
{
|
|
globerrs[EE_FILENOTFOUND % ERRMOD] = ER(ER_FILE_NOT_FOUND);
|
|
globerrs[EE_CANTCREATEFILE % ERRMOD]= ER(ER_CANT_CREATE_FILE);
|
|
globerrs[EE_READ % ERRMOD] = ER(ER_ERROR_ON_READ);
|
|
globerrs[EE_WRITE % ERRMOD] = ER(ER_ERROR_ON_WRITE);
|
|
globerrs[EE_BADCLOSE % ERRMOD] = ER(ER_ERROR_ON_CLOSE);
|
|
globerrs[EE_OUTOFMEMORY % ERRMOD] = ER(ER_OUTOFMEMORY);
|
|
globerrs[EE_DELETE % ERRMOD] = ER(ER_CANT_DELETE_FILE);
|
|
globerrs[EE_LINK % ERRMOD] = ER(ER_ERROR_ON_RENAME);
|
|
globerrs[EE_EOFERR % ERRMOD] = ER(ER_UNEXPECTED_EOF);
|
|
globerrs[EE_CANTLOCK % ERRMOD] = ER(ER_CANT_LOCK);
|
|
globerrs[EE_DIR % ERRMOD] = ER(ER_CANT_READ_DIR);
|
|
globerrs[EE_STAT % ERRMOD] = ER(ER_CANT_GET_STAT);
|
|
globerrs[EE_GETWD % ERRMOD] = ER(ER_CANT_GET_WD);
|
|
globerrs[EE_SETWD % ERRMOD] = ER(ER_CANT_SET_WD);
|
|
globerrs[EE_DISK_FULL % ERRMOD] = ER(ER_DISK_FULL);
|
|
}
|
|
}
|