mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 04:26:45 +03:00 
			
		
		
		
	(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
		
			
				
	
	
		
			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>
 | |
| #ifdef __WIN__
 | |
| #include  <limits.h>
 | |
| #endif
 | |
| #include "my_regex.h"
 | |
| #include "utils.h"
 | |
| #include "regex2.h"
 | |
| 
 | |
| /* for use in asserts */
 | |
| #define nope 0
 | |
| 
 | |
| /* macros for manipulating states, small version */
 | |
| #define	states	long
 | |
| #define	states1	long		/* for later use in regexec() decision. Ensure Win64 definition is correct.*/
 | |
| #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 */
 | |
| my_regexec(preg, str, nmatch, pmatch, eflags)
 | |
| const my_regex_t *preg;
 | |
| const char *str;
 | |
| size_t nmatch;
 | |
| my_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(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
 | |
| 	else
 | |
| 		return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
 | |
| }
 |