mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
d3ee9abf2a
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d:
Delete: dbug/readme.prof
client/mysqlslap.c:
typo fixed
configure.in:
test for sleep() too
dbug/dbug.c:
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
style changes to be more in line with MySQL code
cleanup (many mallocs removed)
incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info"))
DBUG_SET, _db_explain_
-#T
dbug/monty.doc:
obsolete and duplicate docs removed
dbug/user.r:
new features documented
include/my_dbug.h:
correct do{}while wrapping
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
DBUG_EVALUATE,DBUG_EVALUATE_IF
libmysql/libmysql.c:
remove _db_on_ and DEBUGGER_ON/OFF
mysys/my_init.c:
missed DBUG_RETURN
mysys/my_thr_init.c:
bugfix - transaction id's are unsigned
mysys/testhash.c:
remove _db_on_ and DEBUGGER_ON/OFF
sql/ha_myisammrg.cc:
missed ;
sql/ha_ndbcluster.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/ha_ndbcluster_binlog.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/item_cmpfunc.cc:
missed ;
sql/lock.cc:
missed DBUG_RETURN
sql/log_event.cc:
missed ;
sql/mysqld.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
DBUG_SET_INITIAL
sql/opt_range.cc:
remove _db_on_ and DEBUGGER_ON/OFF
sql/set_var.cc:
class sys_var_thd_dbug and "debug" server variable
sql/set_var.h:
class sys_var_thd_dbug and "debug" server variable
sql/slave.cc:
missed ;
sql/sql_cache.cc:
missed ;
sql/sql_plugin.cc:
missed ;
sql/sql_select.cc:
remove _db_on_ and DEBUGGER_ON/OFF
storage/heap/hp_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_eval.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_open.c:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
storage/myisam/mi_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test3.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/ndb/src/ndbapi/DictCache.cpp:
missed ;
storage/ndb/src/ndbapi/NdbTransaction.cpp:
missed ;
tests/mysql_client_test.c:
remove _db_on_ and DEBUGGER_ON/OFF
109 lines
4.3 KiB
C
109 lines
4.3 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef _dbug_h
|
|
#define _dbug_h
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
#if !defined(DBUG_OFF) && !defined(_lint)
|
|
struct _db_code_state_;
|
|
extern int _db_keyword_(struct _db_code_state_ *cs, const char *keyword);
|
|
extern int _db_strict_keyword_(const char *keyword);
|
|
extern int _db_explain_(struct _db_code_state_ *cs, char *buf, int len);
|
|
extern int _db_explain_init_(char *buf, int len);
|
|
extern void _db_setjmp_(void);
|
|
extern void _db_longjmp_(void);
|
|
extern void _db_process_(const char *name);
|
|
extern void _db_push_(const char *control);
|
|
extern void _db_pop_(void);
|
|
extern void _db_set_(struct _db_code_state_ *cs, const char *control);
|
|
extern void _db_set_init_(const char *control);
|
|
extern void _db_enter_(const char *_func_,const char *_file_,uint _line_,
|
|
const char **_sfunc_,const char **_sfile_,
|
|
uint *_slevel_, char ***);
|
|
extern void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
|
|
uint *_slevel_);
|
|
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_lock_file_(void);
|
|
extern void _db_unlock_file_(void);
|
|
extern FILE *_db_fp_(void);
|
|
|
|
#define DBUG_ENTER(a) const char *_db_func_, *_db_file_; uint _db_level_; \
|
|
char **_db_framep_; \
|
|
_db_enter_ (a,__FILE__,__LINE__,&_db_func_,&_db_file_,&_db_level_, \
|
|
&_db_framep_)
|
|
#define DBUG_LEAVE \
|
|
_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_)
|
|
#define DBUG_RETURN(a1) do {DBUG_LEAVE; return(a1);} while(0)
|
|
#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
|
|
#define DBUG_EXECUTE(keyword,a1) \
|
|
do {if (_db_keyword_(0, (keyword))) { a1 }} while(0)
|
|
#define DBUG_EXECUTE_IF(keyword,a1) \
|
|
do {if (_db_strict_keyword_ (keyword)) { a1 } } while(0)
|
|
#define DBUG_EVALUATE(keyword,a1,a2) \
|
|
(_db_keyword_(0,(keyword)) ? (a1) : (a2))
|
|
#define DBUG_EVALUATE_IF(keyword,a1,a2) \
|
|
(_db_strict_keyword_((keyword)) ? (a1) : (a2))
|
|
#define DBUG_PRINT(keyword,arglist) \
|
|
do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
|
|
#define DBUG_PUSH(a1) _db_push_ (a1)
|
|
#define DBUG_POP() _db_pop_ ()
|
|
#define DBUG_SET(a1) _db_set_ (0, (a1))
|
|
#define DBUG_SET_INITIAL(a1) _db_set_init_ (a1)
|
|
#define DBUG_PROCESS(a1) _db_process_(a1)
|
|
#define DBUG_FILE _db_fp_()
|
|
#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_LOCK_FILE _db_lock_file_()
|
|
#define DBUG_UNLOCK_FILE _db_unlock_file_()
|
|
#define DBUG_ASSERT(A) assert(A)
|
|
#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
|
|
#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
|
|
#else /* No debugger */
|
|
|
|
#define DBUG_ENTER(a1)
|
|
#define DBUG_RETURN(a1) do { return(a1); } while(0)
|
|
#define DBUG_VOID_RETURN do { return; } while(0)
|
|
#define DBUG_EXECUTE(keyword,a1) do { } while(0)
|
|
#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0)
|
|
#define DBUG_EVALUATE(keyword,a1,a2) (a2)
|
|
#define DBUG_EVALUATE_IF(keyword,a1,a2) (a2)
|
|
#define DBUG_PRINT(keyword,arglist) do { } while(0)
|
|
#define DBUG_PUSH(a1)
|
|
#define DBUG_SET(a1)
|
|
#define DBUG_SET_INITIAL(a1)
|
|
#define DBUG_POP()
|
|
#define DBUG_PROCESS(a1) (a1)
|
|
#define DBUG_SETJMP(a1) setjmp(a1)
|
|
#define DBUG_LONGJMP(a1) longjmp(a1)
|
|
#define DBUG_DUMP(keyword,a1,a2)
|
|
#define DBUG_ASSERT(A)
|
|
#define DBUG_LOCK_FILE
|
|
#define DBUG_FILE (stderr)
|
|
#define DBUG_UNLOCK_FILE
|
|
#define DBUG_EXPLAIN(buf,len)
|
|
#define DBUG_EXPLAIN_INITIAL(buf,len)
|
|
#endif
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|