mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
merge
This commit is contained in:
12
dbug/dbug.c
12
dbug/dbug.c
@@ -86,6 +86,8 @@
|
||||
#include <m_string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef DBUG_OFF
|
||||
|
||||
#ifdef HAVE_FNMATCH_H
|
||||
#include <fnmatch.h>
|
||||
#else
|
||||
@@ -424,7 +426,7 @@ void _db_process_(const char *name)
|
||||
* 0 - a list of functions was not changed
|
||||
*/
|
||||
|
||||
int DbugParse(CODE_STATE *cs, const char *control)
|
||||
static int DbugParse(CODE_STATE *cs, const char *control)
|
||||
{
|
||||
const char *end;
|
||||
int rel, f_used=0;
|
||||
@@ -661,8 +663,8 @@ int DbugParse(CODE_STATE *cs, const char *control)
|
||||
(ListFlags(cs->stack->functions) & INCLUDE) ? \
|
||||
0 : (uint)TRACE_ON)
|
||||
|
||||
void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
|
||||
struct _db_stack_frame_ *framep)
|
||||
static void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
|
||||
struct _db_stack_frame_ *framep)
|
||||
{
|
||||
if (framep->prev)
|
||||
FixTraceFlags_helper(cs, framep->func, framep->prev);
|
||||
@@ -687,7 +689,7 @@ void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
|
||||
|
||||
#define fflags(cs) cs->stack->out_file ? ListFlags(cs->stack->functions) : TRACE_ON;
|
||||
|
||||
void FixTraceFlags(uint old_fflags, CODE_STATE *cs)
|
||||
static void FixTraceFlags(uint old_fflags, CODE_STATE *cs)
|
||||
{
|
||||
const char *func;
|
||||
uint new_fflags, traceon, level;
|
||||
@@ -2489,3 +2491,5 @@ static void sf_terminate()
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#endif /* DBUG_OFF */
|
||||
|
Reference in New Issue
Block a user