mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
268 lines
6.4 KiB
C
268 lines
6.4 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
/* Saves all errmesg in a header file, updated by me, in a compact file */
|
|
|
|
#include <my_global.h>
|
|
#include <m_ctype.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
|
|
#define MAXLENGTH 1000
|
|
#define MAX_ROWS 1000
|
|
#define MAX_FILES 10
|
|
|
|
int row_count;
|
|
uint file_pos[MAX_ROWS],file_row_pos[MAX_FILES];
|
|
my_string saved_row[MAX_ROWS];
|
|
uchar file_head[]= { 254,254,2,1 };
|
|
|
|
static void get_options(int *argc,char **argv[]);
|
|
static int count_rows(FILE *from,pchar c, pchar c2);
|
|
static int remember_rows(FILE *from,pchar c);
|
|
static int copy_rows(FILE *to);
|
|
|
|
|
|
/* Functions defined in this file */
|
|
|
|
int main(int argc,char *argv[])
|
|
{
|
|
int i,error,files,length;
|
|
uchar head[32];
|
|
FILE *from,*to;
|
|
MY_INIT(argv[0]);
|
|
|
|
get_options(&argc,&argv);
|
|
error=1;
|
|
row_count=files=0;
|
|
|
|
to=0;
|
|
for ( ; argc-- > 1 ; argv++)
|
|
{
|
|
file_row_pos[files++] = row_count;
|
|
|
|
if ((from = fopen(*argv,"r")) == NULL)
|
|
{
|
|
fprintf(stderr,"Can't open file '%s'\n",*argv);
|
|
return(1);
|
|
}
|
|
|
|
VOID(count_rows(from,'"','}')); /* Calculate start-info */
|
|
if (remember_rows(from,'}') < 0) /* Remember rows */
|
|
{
|
|
fprintf(stderr,"Can't find textrows in '%s'\n",*argv);
|
|
fclose(from);
|
|
goto end;
|
|
}
|
|
fclose(from);
|
|
}
|
|
|
|
if ((to=my_fopen(*argv,O_WRONLY | FILE_BINARY,MYF(0))) == NULL)
|
|
{
|
|
fprintf(stderr,"Can't create file '%s'\n",*argv);
|
|
return(1);
|
|
}
|
|
|
|
fseek(to,(long) (32+row_count*2),0);
|
|
if (copy_rows(to))
|
|
goto end;
|
|
|
|
length=ftell(to)-32-row_count*2;
|
|
|
|
bzero((gptr) head,32); /* Save Header & pointers */
|
|
bmove((byte*) head,(byte*) file_head,4);
|
|
head[4]=files;
|
|
int2store(head+6,length);
|
|
int2store(head+8,row_count);
|
|
for (i=0 ; i<files ; i++)
|
|
{
|
|
int2store(head+10+i+i,file_row_pos[i]);
|
|
}
|
|
|
|
fseek(to,0l,0);
|
|
if (fwrite(head,1,32,to) != 32)
|
|
goto end;
|
|
|
|
for (i=0 ; i<row_count ; i++)
|
|
{
|
|
int2store(head,file_pos[i]);
|
|
if (fwrite(head,1,2,to) != 2)
|
|
goto end;
|
|
}
|
|
error=0;
|
|
printf("Found %d messages in language file %s\n",row_count,*argv);
|
|
|
|
end:
|
|
if (to)
|
|
fclose(to);
|
|
if (error)
|
|
fprintf(stderr,"Can't uppdate messagefile %s, errno: %d\n",*argv,errno);
|
|
|
|
exit(error);
|
|
return(0);
|
|
} /* main */
|
|
|
|
|
|
/* Read options */
|
|
|
|
static void get_options(register int *argc,register char **argv[])
|
|
{
|
|
int help=0;
|
|
char *pos,*progname;
|
|
|
|
progname= (*argv)[0];
|
|
while (--*argc >0 && *(pos = *(++*argv)) == '-' ) {
|
|
while (*++pos)
|
|
switch(*pos) {
|
|
case '#':
|
|
DBUG_PUSH (++pos);
|
|
*(pos--) = '\0'; /* Skippa argument */
|
|
break;
|
|
case 'V':
|
|
printf("%s (Compile errormessage) Ver 1.3\n",progname);
|
|
break;
|
|
case 'I':
|
|
case '?':
|
|
printf(" %s (Compile errormessage) Ver 1.3\n",progname);
|
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
|
printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname);
|
|
puts("Options: -Info -Version\n");
|
|
help=1;
|
|
break;
|
|
default:
|
|
fprintf(stderr,"illegal option: -%c\n",*pos);
|
|
fprintf(stderr,"legal options: -?IV\n");
|
|
break;
|
|
}
|
|
}
|
|
if (*argc < 2)
|
|
{
|
|
if (!help)
|
|
printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname);
|
|
exit(-1);
|
|
}
|
|
return;
|
|
} /* get_options */
|
|
|
|
|
|
/* Count rows in from-file until row that start with char is found */
|
|
|
|
static int count_rows(FILE *from, pchar c, pchar c2)
|
|
{
|
|
int count;
|
|
long pos;
|
|
char rad[MAXLENGTH];
|
|
DBUG_ENTER("count_rows");
|
|
|
|
pos=ftell(from); count=0;
|
|
while (fgets(rad,MAXLENGTH,from) != NULL)
|
|
{
|
|
if (rad[0] == c || rad[0] == c2)
|
|
break;
|
|
count++;
|
|
pos=ftell(from);
|
|
}
|
|
fseek(from,pos,0); /* Position to beginning of last row */
|
|
DBUG_PRINT("exit",("count: %d",count));
|
|
DBUG_RETURN(count);
|
|
} /* count_rows */
|
|
|
|
|
|
/* Read rows and remember them until row that start with char */
|
|
/* Converts row as a C-compiler would convert a textstring */
|
|
|
|
static int remember_rows(FILE* from, pchar c)
|
|
{
|
|
int i,nr,start_count,found_end;
|
|
char row[MAXLENGTH],*pos;
|
|
DBUG_ENTER("remember_rows");
|
|
|
|
start_count=row_count; found_end=0;
|
|
while (fgets(row,MAXLENGTH,from) != NULL)
|
|
{
|
|
if (row[0] == c)
|
|
{
|
|
found_end=1;
|
|
break;
|
|
}
|
|
for (pos=row ; *pos ;)
|
|
{
|
|
if (*pos == '\\')
|
|
{
|
|
switch (*++pos) {
|
|
case '\\':
|
|
case '"':
|
|
VOID(strmov(pos-1,pos));
|
|
break;
|
|
case 'n':
|
|
pos[-1]='\n';
|
|
VOID(strmov(pos,pos+1));
|
|
break;
|
|
default:
|
|
if (*pos >= '0' && *pos <'8')
|
|
{
|
|
nr=0;
|
|
for (i=0 ; i<3 && (*pos >= '0' && *pos <'8' ) ; i++)
|
|
nr=nr*8+ (*(pos++) -'0');
|
|
pos-=i;
|
|
pos[-1]=nr;
|
|
VOID(strmov(pos,pos+i));
|
|
}
|
|
else if (*pos)
|
|
VOID(strmov(pos-1,pos)); /* Remove '\' */
|
|
}
|
|
}
|
|
else pos++;
|
|
}
|
|
while (pos >row+1 && *pos != '"')
|
|
pos--;
|
|
|
|
if (!(saved_row[row_count] = (my_string) my_malloc((uint) (pos-row),
|
|
MYF(MY_WME))))
|
|
DBUG_RETURN(-1);
|
|
*pos=0;
|
|
VOID(strmov(saved_row[row_count],row+1));
|
|
row_count++;
|
|
}
|
|
if (row_count-start_count == 0 && ! found_end)
|
|
DBUG_RETURN(-1); /* Found nothing */
|
|
DBUG_RETURN(row_count-start_count);
|
|
} /* remember_rows */
|
|
|
|
|
|
/* Copy rows from memory to file and remember position */
|
|
|
|
|
|
static int copy_rows(FILE *to)
|
|
{
|
|
int row_nr;
|
|
long start_pos;
|
|
DBUG_ENTER("copy_rows");
|
|
|
|
start_pos=ftell(to);
|
|
for (row_nr =0 ; row_nr < row_count; row_nr++)
|
|
{
|
|
file_pos[row_nr]= (int) (ftell(to)-start_pos);
|
|
if (fputs(saved_row[row_nr],to) == EOF || fputc('\0',to) == EOF)
|
|
{
|
|
fprintf(stderr,"Can't write to outputfile\n");
|
|
DBUG_RETURN(1);
|
|
}
|
|
my_free((gptr) saved_row[row_nr],MYF(0));
|
|
}
|
|
DBUG_RETURN(0);
|
|
} /* copy_rows */
|