mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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
120 lines
3 KiB
C
120 lines
3 KiB
C
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include <regex.h>
|
|
|
|
#include "utils.h"
|
|
#include "regerror.ih"
|
|
|
|
/*
|
|
= #define REG_NOMATCH 1
|
|
= #define REG_BADPAT 2
|
|
= #define REG_ECOLLATE 3
|
|
= #define REG_ECTYPE 4
|
|
= #define REG_EESCAPE 5
|
|
= #define REG_ESUBREG 6
|
|
= #define REG_EBRACK 7
|
|
= #define REG_EPAREN 8
|
|
= #define REG_EBRACE 9
|
|
= #define REG_BADBR 10
|
|
= #define REG_ERANGE 11
|
|
= #define REG_ESPACE 12
|
|
= #define REG_BADRPT 13
|
|
= #define REG_EMPTY 14
|
|
= #define REG_ASSERT 15
|
|
= #define REG_INVARG 16
|
|
= #define REG_ATOI 255 // convert name to number (!)
|
|
= #define REG_ITOA 0400 // convert number to name (!)
|
|
*/
|
|
static struct rerr {
|
|
int code;
|
|
char *name;
|
|
char *explain;
|
|
} rerrs[] = {
|
|
{REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match"},
|
|
{REG_BADPAT, "REG_BADPAT", "invalid regular expression"},
|
|
{REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element"},
|
|
{REG_ECTYPE, "REG_ECTYPE", "invalid character class"},
|
|
{REG_EESCAPE, "REG_EESCAPE", "trailing backslash (\\)"},
|
|
{REG_ESUBREG, "REG_ESUBREG", "invalid backreference number"},
|
|
{REG_EBRACK, "REG_EBRACK", "brackets ([ ]) not balanced"},
|
|
{REG_EPAREN, "REG_EPAREN", "parentheses not balanced"},
|
|
{REG_EBRACE, "REG_EBRACE", "braces not balanced"},
|
|
{REG_BADBR, "REG_BADBR", "invalid repetition count(s)"},
|
|
{REG_ERANGE, "REG_ERANGE", "invalid character range"},
|
|
{REG_ESPACE, "REG_ESPACE", "out of memory"},
|
|
{REG_BADRPT, "REG_BADRPT", "repetition-operator operand invalid"},
|
|
{REG_EMPTY, "REG_EMPTY", "empty (sub)expression"},
|
|
{REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug"},
|
|
{REG_INVARG, "REG_INVARG", "invalid argument to regex routine"},
|
|
{0, "", "*** unknown regexp error code ***"},
|
|
};
|
|
|
|
/*
|
|
- regerror - the interface to error numbers
|
|
= extern size_t regerror(int, const regex_t *, char *, size_t);
|
|
*/
|
|
/* ARGSUSED */
|
|
size_t
|
|
regerror(errcode, preg, errbuf, errbuf_size)
|
|
int errcode;
|
|
const regex_t *preg;
|
|
char *errbuf;
|
|
size_t errbuf_size;
|
|
{
|
|
register struct rerr *r;
|
|
register size_t len;
|
|
register int target = errcode &~ REG_ITOA;
|
|
register char *s;
|
|
char convbuf[50];
|
|
|
|
if (errcode == REG_ATOI)
|
|
s = regatoi(preg, convbuf);
|
|
else {
|
|
for (r = rerrs; r->code != 0; r++)
|
|
if (r->code == target)
|
|
break;
|
|
|
|
if (errcode®_ITOA) {
|
|
if (r->code != 0)
|
|
(void) strcpy(convbuf, r->name);
|
|
else
|
|
sprintf(convbuf, "REG_0x%x", target);
|
|
assert(strlen(convbuf) < sizeof(convbuf));
|
|
s = convbuf;
|
|
} else
|
|
s = r->explain;
|
|
}
|
|
|
|
len = strlen(s) + 1;
|
|
if (errbuf_size > 0) {
|
|
if (errbuf_size > len)
|
|
(void) strcpy(errbuf, s);
|
|
else {
|
|
(void) strncpy(errbuf, s, errbuf_size-1);
|
|
errbuf[errbuf_size-1] = '\0';
|
|
}
|
|
}
|
|
|
|
return(len);
|
|
}
|
|
|
|
/*
|
|
- regatoi - internal routine to implement REG_ATOI
|
|
== static char *regatoi(const regex_t *preg, char *localbuf);
|
|
*/
|
|
static char *
|
|
regatoi(preg, localbuf)
|
|
const regex_t *preg;
|
|
char *localbuf;
|
|
{
|
|
register struct rerr *r;
|
|
for (r = rerrs; r->code != 0; r++)
|
|
if (strcmp(r->name, preg->re_endp) == 0)
|
|
break;
|
|
if (r->code == 0)
|
|
return("0");
|
|
|
|
sprintf(localbuf, "%d", r->code);
|
|
return(localbuf);
|
|
}
|