Commit 771d3d82 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 

into  mysql.com:/usr/local/mysql/tmp-5.1


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
dbug/dbug.c:
  Manual merge
include/my_dbug.h:
  Manual merge
parents 39b5c0f5 a046322b

client/mysqlbinlog.cc

+4 −2
Original line number Diff line number Diff line
@@ -815,7 +815,8 @@ static void die(const char* fmt, ...) 
  fprintf(stderr, "\n");

  va_end(args);

  cleanup();

  my_end(0);

  /* We cannot free DBUG, it is used in global destructors after exit(). */

  my_end(MY_DONT_FREE_DBUG);

  exit(1);

}
@@ -1487,7 +1488,8 @@ int main(int argc, char** argv) 
  cleanup();

  free_defaults(defaults_argv);

  my_free_open_file_info();

  my_end(0);

  /* We cannot free DBUG, it is used in global destructors after exit(). */

  my_end(MY_DONT_FREE_DBUG);

  exit(exit_value);

  DBUG_RETURN(exit_value);			// Keep compilers happy

}

dbug/dbug.c

+65 −13
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ static void DBUGOpenFile(CODE_STATE *,const char *, const char *, int); 
static void DBUGCloseFile(CODE_STATE *cs, FILE *fp);

        /* Push current debug settings */

static void PushState(CODE_STATE *cs);

	/* Free memory associated with debug state. */

static void FreeState (struct state *state);

        /* Test for tracing enabled */

static BOOLEAN DoTrace(CODE_STATE *cs);
@@ -742,19 +744,7 @@ void _db_pop_() 
  if (discard->next != NULL)

  {

    cs->stack= discard->next;

    if (!is_shared(discard, keywords))

      FreeList(discard->keywords);

    if (!is_shared(discard, functions))

      FreeList(discard->functions);

    if (!is_shared(discard, processes))

      FreeList(discard->processes);

    if (!is_shared(discard, p_functions))

      FreeList(discard->p_functions);

    if (!is_shared(discard, out_file))

      DBUGCloseFile(cs, discard->out_file);

    if (discard->prof_file)

      DBUGCloseFile(cs, discard->prof_file);

    free((char *) discard);

    FreeState(discard);

  }

}
@@ -1425,6 +1415,68 @@ static void PushState(CODE_STATE *cs) 
  cs->stack= new_malloc;

}



/*

 *  FUNCTION

 *

 *	FreeState    Free memory associated with a struct state.

 *

 *  SYNOPSIS

 *

 *	static void FreeState (state)

 *	struct state *state;

 *

 *  DESCRIPTION

 *

 *	Deallocates the memory allocated for various information in a

 *	state.

 *

 */

static void FreeState (

struct state *state)

{

  if (!is_shared(state, keywords))

    FreeList(state->keywords);

  if (!is_shared(state, functions))

    FreeList(state->functions);

  if (!is_shared(state, processes))

    FreeList(state->processes);

  if (!is_shared(state, p_functions))

    FreeList(state->p_functions);

  if (!is_shared(state, out_file))

    DBUGCloseFile(cs, state->out_file);

  if (state->prof_file)

    DBUGCloseFile(cs, state->prof_file);

  free((char *) state);

}





/*

 *  FUNCTION

 *

 *	_db_end_    End debugging, freeing state stack memory.

 *

 *  SYNOPSIS

 *

 *	static VOID _db_end_ ()

 *

 *  DESCRIPTION

 *

 *	Ends debugging, de-allocating the memory allocated to the

 *	state stack.

 *

 *	To be called at the very end of the program.

 *

 */

void _db_end_ ()

{

  reg1 struct state *discard;

  while((discard= stack) != NULL) {

    stack= discard -> next_state;

    FreeState (discard);

  }

  _db_on_=0;

}





/*

 *  FUNCTION

include/my_dbug.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern void _db_pargs_(uint _line_,const char *keyword); 
extern	void _db_doprnt_ _VARARGS((const char *format,...));

extern	void _db_dump_(uint _line_,const char *keyword,const char *memory,

		       uint length);

extern	void _db_end_(void);

extern	void _db_lock_file_(void);

extern	void _db_unlock_file_(void);

extern FILE *_db_fp_(void);
@@ -73,6 +74,7 @@ extern FILE *_db_fp_(void); 
#define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))

#define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))

#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)

#define DBUG_END()  _db_end_ ()

#define DBUG_LOCK_FILE _db_lock_file_()

#define DBUG_UNLOCK_FILE _db_unlock_file_()

#define DBUG_ASSERT(A) assert(A)
@@ -97,6 +99,7 @@ extern FILE *_db_fp_(void); 
#define DBUG_SETJMP(a1) setjmp(a1)

#define DBUG_LONGJMP(a1) longjmp(a1)

#define DBUG_DUMP(keyword,a1,a2)

#define DBUG_END()

#define DBUG_ASSERT(A)

#define DBUG_LOCK_FILE

#define DBUG_FILE (stderr)

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ extern int NEAR my_errno; /* Last error in mysys */ 


#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */

#define MY_GIVE_INFO	2	/* Give time info about process*/

#define MY_DONT_FREE_DBUG 4     /* Do not call DBUG_END() in my_end() */



#define ME_HIGHBYTE	8	/* Shift for colours */

#define ME_NOCUR	1	/* Don't use curses message */

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void STDCALL mysql_server_end() 
  /* If library called my_init(), free memory allocated by it */

  if (!org_my_init_done)

  {

    my_end(0);

    my_end(MY_DONT_FREE_DBUG);

  /* Remove TRACING, if enabled by mysql_debug() */

    DBUG_POP();

  }