mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
7873b89fc5
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319) Fixed crash when doing rollback in slave and the io thread catched up with the sql thread Set locked_in_memory properly include/mysql_com.h: Fixed compiler warning libmysqld/emb_qcache.cc: Removed not used variable libmysqld/lib_sql.cc: Removed not used variable myisam/mi_locking.c: Added comment myisam/mi_rnext.c: Fixed bug in concurrent insert myisam/mi_rprev.c: Simple optimization mysql-test/r/func_gconcat.result: New tests mysql-test/t/func_gconcat.test: New tests mysql-test/t/func_group.test: Cleanup sql-common/client.c: Removed compiler warning sql/derror.cc: Better comments sql/field.cc: Removed not used function/variable sql/field.h: Removed not needed variable sql/ha_innodb.cc: Removed not used function sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_func.cc: Fixed compiler warning sql/item_geofunc.cc: Fixed compiler warning sql/item_sum.cc: Fixed bugs in group_concat and added more comments (Bugs #2695, #3381 and #3319) - field->abs_offset was not needed - Wrong assumption of field order in temporary table - Some not used variables removed - Added ORDER BY fields after argument fields so that code in sql_select.cc can move all fields to point to temporary tables, if needed. - Optimized loops sql/item_sum.h: Bug fixing and cleanup of group_concat() sql/log.cc: Removed wrong comment sql/log_event.cc: Removed compiler warning sql/mysqld.cc: Set locked_in_memory properly sql/protocol.cc: Removed compiler warning sql/set_var.cc: Code cleanup sql/slave.cc: Fixed crash when doing rollback in slave and the io thread catched up with the sql thread sql/sql_cache.cc: Removed compiler warnings sql/sql_derived.cc: Removed not used variable sql/sql_insert.cc: Removed compiler warnings sql/sql_lex.cc: Removed not used lable sql/sql_lex.h: Removed compiler warnings sql/sql_parse.cc: Removed compiler warnings sql/sql_prepare.cc: Removed compiler warnings sql/sql_select.cc: Removed not used variables Added function comments sql/sql_show.cc: Removed compiler warnings sql/sql_yacc.yy: Fix for ORDER BY handling in GROUP_CONCAT()
167 lines
5.1 KiB
C++
167 lines
5.1 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 bool read_texts(const char *file_name,const char ***point,
|
|
uint error_messages);
|
|
static void init_myfunc_errs(void);
|
|
|
|
/* Read messages from errorfile */
|
|
|
|
bool init_errmessage(void)
|
|
{
|
|
DBUG_ENTER("init_errmessage");
|
|
|
|
if (read_texts(ERRMSG_FILE,&my_errmsg[ERRMAPP],ER_ERROR_MESSAGES))
|
|
DBUG_RETURN(TRUE);
|
|
errmesg=my_errmsg[ERRMAPP]; /* Init global variabel */
|
|
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 */
|
|
|
|
static bool 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;
|
|
CHARSET_INFO *cset; // For future
|
|
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];
|
|
|
|
if (!head[30])
|
|
{
|
|
sql_print_error("Character set information not found in '%s'. \
|
|
Please install the latest version of this file.",name);
|
|
goto err1;
|
|
}
|
|
|
|
/* TODO: Convert the character set to server system character set */
|
|
if (!(cset= get_charset(head[30],MYF(MY_WME))))
|
|
{
|
|
sql_print_error("Character set #%d is not supported for messagefile '%s'",
|
|
(int)head[30],name);
|
|
goto err1;
|
|
}
|
|
|
|
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_RETURN(0);
|
|
|
|
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;
|
|
}
|
|
sql_print_error(buff,name);
|
|
err1:
|
|
if (file != FERR)
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
unireg_abort(1);
|
|
DBUG_RETURN(1); // keep compiler happy
|
|
} /* 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);
|
|
}
|
|
}
|