mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	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
		
			
				
	
	
		
			140 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			140 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * the outer shell of regexec()
 | 
						|
 *
 | 
						|
 * This file includes engine.c *twice*, after muchos fiddling with the
 | 
						|
 * macros that code uses.  This lets the same code operate on two different
 | 
						|
 * representations for state sets.
 | 
						|
 */
 | 
						|
#include <my_global.h>
 | 
						|
#include <m_string.h>
 | 
						|
#include <m_ctype.h>
 | 
						|
#include <regex.h>
 | 
						|
#ifdef __WIN__
 | 
						|
#include  <limits.h>
 | 
						|
#endif
 | 
						|
 | 
						|
#include "utils.h"
 | 
						|
#include "regex2.h"
 | 
						|
 | 
						|
static int nope = 0;		/* for use in asserts; shuts lint up */
 | 
						|
 | 
						|
/* macros for manipulating states, small version */
 | 
						|
#define	states	long
 | 
						|
#define	states1	states		/* for later use in regexec() decision */
 | 
						|
#define	CLEAR(v)	((v) = 0)
 | 
						|
#define	SET0(v, n)	((v) &= ~((states) 1 << (n)))
 | 
						|
#define	SET1(v, n)	((v) |= (states) 1 << (n))
 | 
						|
#define	ISSET(v, n)	((v) & ((states) 1 << (n)))
 | 
						|
#define	ASSIGN(d, s)	((d) = (s))
 | 
						|
#define	EQ(a, b)	((a) == (b))
 | 
						|
#define	STATEVARS	int dummy	/* dummy version */
 | 
						|
#define	STATESETUP(m, n)	/* nothing */
 | 
						|
#define	STATETEARDOWN(m)	/* nothing */
 | 
						|
#define	SETUP(v)	((v) = 0)
 | 
						|
#define	onestate	long			/* Changed from int by Monty */
 | 
						|
#define	INIT(o, n)	((o) = (unsigned states)1 << (n))
 | 
						|
#define	INC(o)	((o) <<= 1)
 | 
						|
#define	ISSTATEIN(v, o)	((v) & (o))
 | 
						|
/* some abbreviations; note that some of these know variable names! */
 | 
						|
/* do "if I'm here, I can also be there" etc without branches */
 | 
						|
#define	FWD(dst, src, n)	((dst) |= ((unsigned states)(src)&(here)) << (n))
 | 
						|
#define	BACK(dst, src, n)	((dst) |= ((unsigned states)(src)&(here)) >> (n))
 | 
						|
#define	ISSETBACK(v, n)	((v) & ((unsigned states)here >> (n)))
 | 
						|
/* function names */
 | 
						|
#define SNAMES			/* engine.c looks after details */
 | 
						|
 | 
						|
#include "engine.c"
 | 
						|
 | 
						|
/* now undo things */
 | 
						|
#undef	states
 | 
						|
#undef	CLEAR
 | 
						|
#undef	SET0
 | 
						|
#undef	SET1
 | 
						|
#undef	ISSET
 | 
						|
#undef	ASSIGN
 | 
						|
#undef	EQ
 | 
						|
#undef	STATEVARS
 | 
						|
#undef	STATESETUP
 | 
						|
#undef	STATETEARDOWN
 | 
						|
#undef	SETUP
 | 
						|
#undef	onestate
 | 
						|
#undef	INIT
 | 
						|
#undef	INC
 | 
						|
#undef	ISSTATEIN
 | 
						|
#undef	FWD
 | 
						|
#undef	BACK
 | 
						|
#undef	ISSETBACK
 | 
						|
#undef	SNAMES
 | 
						|
 | 
						|
/* macros for manipulating states, large version */
 | 
						|
#define	states	char *
 | 
						|
#define	CLEAR(v)	memset(v, 0, m->g->nstates)
 | 
						|
#define	SET0(v, n)	((v)[n] = 0)
 | 
						|
#define	SET1(v, n)	((v)[n] = 1)
 | 
						|
#define	ISSET(v, n)	((v)[n])
 | 
						|
#define	ASSIGN(d, s)	memcpy(d, s, m->g->nstates)
 | 
						|
#define	EQ(a, b)	(memcmp(a, b, m->g->nstates) == 0)
 | 
						|
#define	STATEVARS	int vn; char *space
 | 
						|
#define	STATESETUP(m, nv)	{ (m)->space = malloc((nv)*(m)->g->nstates); \
 | 
						|
				if ((m)->space == NULL) return(REG_ESPACE); \
 | 
						|
				(m)->vn = 0; }
 | 
						|
#define	STATETEARDOWN(m)	{ free((m)->space); }
 | 
						|
#define	SETUP(v)	((v) = &m->space[m->vn++ * m->g->nstates])
 | 
						|
#define	onestate	int
 | 
						|
#define	INIT(o, n)	((o) = (n))
 | 
						|
#define	INC(o)	((o)++)
 | 
						|
#define	ISSTATEIN(v, o)	((v)[o])
 | 
						|
/* some abbreviations; note that some of these know variable names! */
 | 
						|
/* do "if I'm here, I can also be there" etc without branches */
 | 
						|
#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
 | 
						|
#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
 | 
						|
#define	ISSETBACK(v, n)	((v)[here - (n)])
 | 
						|
/* function names */
 | 
						|
#define	LNAMES			/* flag */
 | 
						|
 | 
						|
#include "engine.c"
 | 
						|
 | 
						|
/*
 | 
						|
 - regexec - interface for matching
 | 
						|
 = extern int regexec(const regex_t *, const char *, size_t, \
 | 
						|
 =					regmatch_t [], int);
 | 
						|
 = #define	REG_NOTBOL	00001
 | 
						|
 = #define	REG_NOTEOL	00002
 | 
						|
 = #define	REG_STARTEND	00004
 | 
						|
 = #define	REG_TRACE	00400	// tracing of execution
 | 
						|
 = #define	REG_LARGE	01000	// force large representation
 | 
						|
 = #define	REG_BACKR	02000	// force use of backref code
 | 
						|
 *
 | 
						|
 * We put this here so we can exploit knowledge of the state representation
 | 
						|
 * when choosing which matcher to call.  Also, by this point the matchers
 | 
						|
 * have been prototyped.
 | 
						|
 */
 | 
						|
int				/* 0 success, REG_NOMATCH failure */
 | 
						|
regexec(preg, str, nmatch, pmatch, eflags)
 | 
						|
const regex_t *preg;
 | 
						|
const char *str;
 | 
						|
size_t nmatch;
 | 
						|
regmatch_t pmatch[];
 | 
						|
int eflags;
 | 
						|
{
 | 
						|
	register struct re_guts *g = preg->re_g;
 | 
						|
#ifdef REDEBUG
 | 
						|
#	define	GOODFLAGS(f)	(f)
 | 
						|
#else
 | 
						|
#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
 | 
						|
#endif
 | 
						|
 | 
						|
	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
 | 
						|
		return(REG_BADPAT);
 | 
						|
	assert(!(g->iflags&BAD));
 | 
						|
	if (g->iflags&BAD)		/* backstop for no-debug case */
 | 
						|
		return(REG_BADPAT);
 | 
						|
	eflags = GOODFLAGS(eflags);
 | 
						|
 | 
						|
	if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
 | 
						|
	    !(eflags®_LARGE))
 | 
						|
		return(smatcher(g, (char *)str, nmatch, pmatch, eflags));
 | 
						|
	else
 | 
						|
		return(lmatcher(g, (char *)str, nmatch, pmatch, eflags));
 | 
						|
}
 |