mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
280 lines
9.6 KiB
C
280 lines
9.6 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 */
|
|
|
|
/* Test of all stringfunktions that is coded in assembler */
|
|
|
|
#include <my_global.h>
|
|
#include <stdarg.h>
|
|
#include "m_string.h"
|
|
|
|
#define F_LEN 8
|
|
#define F_CHAR 'A'
|
|
#define F_FILL 'B'
|
|
#define T_LEN 15
|
|
#define T_CHAR 'D'
|
|
#define T_FILL 'E'
|
|
#define F_PREFILL '0'
|
|
#define T_PREFILL '1'
|
|
|
|
static char from_buff[100],to_buff[100];
|
|
static my_string from,to;
|
|
static int errors,tests;
|
|
static int test_strarg(const char *name,...);
|
|
static void init_strings (void); /* Init from and to */
|
|
void test_arg (const char *message,long func_value,long value);
|
|
int compare_buff(const char *message,my_string b1,my_string b2,int length,
|
|
pchar fill, pchar prefill);
|
|
|
|
static int my_test(int a)
|
|
{
|
|
return a ? 1 : 0;
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
static char v1[]="Monty",v2[]="on",v3[]="Montys",v4[]="ty",v5[]="gr",
|
|
v6[]="hohohoo",v7[]="hohoo",v8[]="hohooo",v9[]="t",
|
|
cont[]="qwet";
|
|
errors=tests=0;
|
|
init_strings();
|
|
|
|
test_arg("bcmp(from,to,5)",(long) my_test(bcmp(from,to,5)),1L);
|
|
test_arg("bcmp(from,from,5)",(long) bcmp(from,from,5),0L);
|
|
|
|
test_arg("bcmp(from,to,0)",(long) bcmp(from,to,0),0L);
|
|
test_arg("strend(from)",(long) strend(from),(long) from+F_LEN);
|
|
test_arg("strchr(v1,'M')",(long) strchr(v1,'M'),(long) v1);
|
|
test_arg("strchr(v1,'y')",(long) strchr(v1,'y'),(long) v1+4);
|
|
test_arg("strchr(v1,'x')",(long) strchr(v1,'x'),0L);
|
|
test_arg("strcont(v1,cont)",(long) strcont(v1,cont),(long) v1+3);
|
|
test_arg("strcont(v1,v2)",(long) strcont(v1,v2),(long) v1+1);
|
|
test_arg("strcont(v1,v5)",(long) strcont(v1,v5),0L);
|
|
test_arg("is_prefix(v3,v1)",(long) is_prefix(v3,v1),1L);
|
|
test_arg("is_prefix(v1,v3)",(long) is_prefix(v1,v3),0L);
|
|
test_arg("is_prefix(v3,v4)",(long) is_prefix(v3,v4),0L);
|
|
test_arg("strstr(v1,v1)",(long) strstr(v1,v1),(long) v1);
|
|
test_arg("strstr(v1,v2)",(long) strstr(v1,v2),(long) v1+1);
|
|
test_arg("strstr(v1,v4)",(long) strstr(v1,v4),(long) v1+3);
|
|
test_arg("strstr(v6,v7)",(long) strstr(v6,v7),(long) v6+2);
|
|
test_arg("strstr(v1,v9)",(long) strstr(v1,v9),(long) v1+3);
|
|
test_arg("strstr(v1,v3)",(long) strstr(v1,v3),0L);
|
|
test_arg("strstr(v1,v5)",(long) strstr(v1,v5),0L);
|
|
test_arg("strstr(v6,v8)",(long) strstr(v6,v8),0L);
|
|
|
|
test_arg("strinstr(v1,v4)",(long) strinstr(v1,v4),4L);
|
|
test_arg("strinstr(v1,v5)",(long) strinstr(v1,v5),0L);
|
|
test_arg("strlen(from)",(long) strlen(from),(long) F_LEN);
|
|
test_arg("strlen(\"\")",(long) strlen(""),0L);
|
|
#ifdef HAVE_STRNLEN
|
|
test_arg("strnlen(from,3)",(long) strnlen(from,3),3L);
|
|
test_arg("strnlen(from,0)",(long) strnlen(from,0),0L);
|
|
test_arg("strnlen(from,1000)",(long) strnlen(from,1000),(long) F_LEN);
|
|
#endif
|
|
|
|
test_strarg("bfill(to,4,' ')",(bfill(to,4,' '),0L),INT_MAX32,4,' ',0,0);
|
|
test_strarg("bfill(from,0,' ')",(bfill(from,0,' '),0L),INT_MAX32,0,0);
|
|
test_strarg("bzero(to,3)",(bzero(to,3),0L),INT_MAX32,3,0,0,0);
|
|
test_strarg("bzero(to,0)",(bzero(to,0),0L),INT_MAX32,0,0);
|
|
test_strarg("bmove(to,from,4)",(bmove(to,from,4),0L),INT_MAX32,4,F_CHAR,
|
|
0,0);
|
|
test_strarg("bmove(to,from,0)",(bmove(to,from,0),0L),INT_MAX32,0,0);
|
|
test_strarg("bmove_upp(to+6,from+6,3)",(bmove_upp(to+6,from+6,3),0L),INT_MAX32,
|
|
3,T_CHAR,3,F_CHAR,0,0);
|
|
test_strarg("bmove_upp(to,from,0)",(bmove_upp(to,from,0),0L),INT_MAX32,0,0);
|
|
test_strarg("strappend(to,3,' ')",(strappend(to,3,' '),0L),INT_MAX32,
|
|
3,T_CHAR,1,0,T_LEN-4,T_CHAR,1,0,0,0);
|
|
test_strarg("strappend(to,T_LEN+5,' ')",(strappend(to,T_LEN+5,' '),0L),INT_MAX32,
|
|
T_LEN,T_CHAR,5,' ',1,0,0,0);
|
|
test_strarg("strcat(to,from)",strcat(to,from),to,T_LEN,T_CHAR,
|
|
F_LEN,F_CHAR,1,0,0,0);
|
|
test_strarg("strcat(to,\"\")",strcat(to,""),INT_MAX32,0,0);
|
|
test_strarg("strfill(to,4,' ')",strfill(to,4,' '),to+4,4,' ',1,0,0,0);
|
|
test_strarg("strfill(from,0,' ')",strfill(from,0,' '),from,0,1,0,0);
|
|
test_strarg("strmake(to,from,4)",strmake(to,from,4),to+4,4,F_CHAR,
|
|
1,0,0,0);
|
|
test_strarg("strmake(to,from,0)",strmake(to,from,0),to+0,1,0,0,0);
|
|
test_strarg("strmov(to,from)",strmov(to,from),to+F_LEN,F_LEN,F_CHAR,0,0);
|
|
test_strarg("strmov(to,\"\")",strmov(to,""),to,1,0,0,0);
|
|
test_strarg("strnmov(to,from,2)",strnmov(to,from,2),to+2,2,F_CHAR,0,0);
|
|
test_strarg("strnmov(to,from,F_LEN+5)",strnmov(to,from,F_LEN+5),to+F_LEN,
|
|
F_LEN,F_CHAR,1,0,0,0);
|
|
test_strarg("strnmov(to,\"\",2)",strnmov(to,"",2),to,1,0,0,0);
|
|
test_strarg("strxmov(to,from,\"!!\",NullS)",strxmov(to,from,"!!",NullS),to+F_LEN+2,F_LEN,F_CHAR,2,'!',0,0,0);
|
|
test_strarg("strxmov(to,NullS)",strxmov(to,NullS),to,1,0,0,0);
|
|
test_strarg("strxmov(to,from,from,from,from,from,'!!',from,NullS)",strxmov(to,from,from,from,from,from,"!!",from,NullS),to+F_LEN*6+2,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,2,'!',F_LEN,F_CHAR,1,0,0,0);
|
|
|
|
test_strarg("strxnmov(to,100,from,\"!!\",NullS)",strxnmov(to,100,from,"!!",NullS),to+F_LEN+2,F_LEN,F_CHAR,2,'!',0,0,0);
|
|
test_strarg("strxnmov(to,2,NullS)",strxnmov(to,2,NullS),to,1,0,0,0);
|
|
test_strarg("strxnmov(to,100,from,from,from,from,from,'!!',from,NullS)",strxnmov(to,100,from,from,from,from,from,"!!",from,NullS),to+F_LEN*6+2,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,F_LEN,F_CHAR,2,'!',F_LEN,F_CHAR,1,0,0,0);
|
|
test_strarg("strxnmov(to,2,\"!!!\",NullS)",strxnmov(to,2,"!!!",NullS),to+2,2,'!',0,0,0);
|
|
test_strarg("strxnmov(to,2,\"!!\",NullS)",strxnmov(to,2,"!!","xx",NullS),to+2,2,'!',0,0,0);
|
|
test_strarg("strxnmov(to,2,\"!\",\"x\",\"y\",NullS)",strxnmov(to,2,"!","x","y",NullS),to+2,1,'!',1,'x',0,0,0);
|
|
|
|
test_strarg("bchange(to,2,from,4,6)",(bchange(to,2,from,4,6),0L),INT_MAX32,
|
|
4,F_CHAR,2,T_CHAR,0,0);
|
|
|
|
printf("tests: %d errors: %d\n",tests,errors);
|
|
if (errors)
|
|
fputs("--- Some functions doesn't work!! Fix them\n",stderr);
|
|
return(errors > 0);
|
|
|
|
fputs("Fatal error\n",stderr);
|
|
return(2);
|
|
} /* main */
|
|
|
|
|
|
/* Init strings */
|
|
|
|
void init_strings(void)
|
|
{
|
|
reg1 int i;
|
|
reg2 char *pos;
|
|
|
|
from=from_buff+3; to=to_buff+3;
|
|
|
|
pos=from_buff; *pos++= F_FILL; *pos++=F_FILL; *pos++=F_PREFILL;
|
|
for (i=0 ; i < F_LEN ; i++)
|
|
*pos++=F_CHAR;
|
|
*pos++=0;
|
|
for (i=0; i<50 ; i++)
|
|
*pos++= F_FILL;
|
|
|
|
pos=to_buff; *pos++= T_FILL; *pos++=T_FILL; *pos++=T_PREFILL;
|
|
for (i=0 ; i < T_LEN ; i++)
|
|
*pos++=T_CHAR;
|
|
*pos++=0;
|
|
for (i=0; i<50 ; i++)
|
|
*pos++= T_FILL;
|
|
} /* init_strings */
|
|
|
|
|
|
/* Test that function return rigth value */
|
|
|
|
void test_arg(const char *message, long int func_value, long int value)
|
|
{
|
|
tests++;
|
|
printf("testing '%s'\n",message);
|
|
if (func_value != value)
|
|
{
|
|
printf("func: '%s' = %ld Should be: %ld\n",message,func_value,value);
|
|
errors++;
|
|
}
|
|
} /* test_arg */
|
|
|
|
/* Test function return value and from and to arrays */
|
|
|
|
static int test_strarg(const char *message,...)
|
|
{
|
|
long func_value,value;
|
|
int error,length;
|
|
char chr,cmp_buff[100],*pos,*pos2;
|
|
va_list pvar;
|
|
|
|
tests++;
|
|
va_start(pvar,message);
|
|
func_value=va_arg(pvar,long);
|
|
value=va_arg(pvar,long);
|
|
|
|
printf("testing '%s'\n",message);
|
|
if (func_value != value && value != INT_MAX32)
|
|
{
|
|
printf("func: '%s' = %ld Should be: %ld\n",message,func_value,value);
|
|
errors++;
|
|
}
|
|
pos= cmp_buff;
|
|
while ((length = va_arg(pvar, int)) != 0)
|
|
{
|
|
chr= (char) (va_arg(pvar, int));
|
|
while (length--)
|
|
*pos++=chr;
|
|
}
|
|
pos2=to+ (int)(pos-cmp_buff);
|
|
while (pos <= cmp_buff+T_LEN)
|
|
*pos++= *pos2++;
|
|
if (compare_buff(message,to,cmp_buff,(int) (pos-cmp_buff),T_FILL,T_PREFILL))
|
|
{
|
|
init_strings();
|
|
va_end(pvar);
|
|
return 1;
|
|
}
|
|
|
|
pos= cmp_buff;
|
|
while ((length = va_arg(pvar, int)) != 0)
|
|
{
|
|
chr= (char) (va_arg(pvar, int));
|
|
while (length--)
|
|
*pos++=chr;
|
|
}
|
|
pos2=from+ (int)(pos-cmp_buff);
|
|
while (pos <= cmp_buff+F_LEN)
|
|
*pos++= *pos2++;
|
|
error=compare_buff(message,from,cmp_buff,(int) (pos-cmp_buff),F_FILL,F_PREFILL);
|
|
init_strings();
|
|
va_end(pvar);
|
|
return (error != 0);
|
|
} /* test_strarg */
|
|
|
|
|
|
/* test if function made right value */
|
|
|
|
int compare_buff(const char *message, my_string b1, my_string b2, int length,
|
|
pchar fill, pchar prefill)
|
|
{
|
|
int i,error=0;
|
|
|
|
if (bcmp(b1,b2,length))
|
|
{
|
|
errors++;
|
|
printf("func: '%s' Buffers differ\nIs: ",message);
|
|
for (i=0 ; i<length ; i++)
|
|
printf("%3d ",b1[i]);
|
|
printf("\nShould be: ");
|
|
for (i=0 ; i<length ; i++)
|
|
printf("%3d ",b2[i]);
|
|
puts("");
|
|
}
|
|
else if (b1[-1] != prefill || b1[-2] != fill || b1[-3] != fill)
|
|
{
|
|
printf("func: '%s' Chars before buffer is changed\n",message);
|
|
errors++;
|
|
error=1;
|
|
}
|
|
else if (b1[length] != fill || b1[length+1] != fill)
|
|
{
|
|
printf("func: '%s' Chars after buffer is changed\n",message);
|
|
errors++;
|
|
error=1;
|
|
}
|
|
return error;
|
|
} /* compare_buff */
|
|
|
|
/* These are here to be loaded and examined */
|
|
|
|
extern void dummy_functions(void);
|
|
|
|
void dummy_functions(void)
|
|
{
|
|
VOID(memchr(from,'a',5));
|
|
VOID(memcmp(from,to,5));
|
|
VOID(memcpy(from,to,5));
|
|
VOID(memset(from,' ',5));
|
|
VOID(strcmp(from,to));
|
|
VOID(strcpy(from,to));
|
|
VOID(strstr(from,to));
|
|
VOID(strrchr(from,'a'));
|
|
return;
|
|
}
|