diff options
| author | unknown <serg@serg.mylan> | 2006-02-15 00:14:37 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-02-15 00:14:37 +0100 |
| commit | bf3b67f3473f233cfead71a121040cee8bbd3198 (patch) | |
| tree | 96586a07852fed86e6ea3c5656bb00c18b437a09 /dbug/dbug.c | |
| parent | 832dd46f49907334719f4564630f590897e900b8 (diff) | |
| download | mariadb-git-bf3b67f3473f233cfead71a121040cee8bbd3198.tar.gz | |
post-merge fixes for dbug
dbug/dbug.c:
post-merge fixes (-#T in explain was forgotten)
sql/set_var.h:
post-merge fixes (DBUG_POP() is the correct way to restore default settings now)
Diffstat (limited to 'dbug/dbug.c')
| -rw-r--r-- | dbug/dbug.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index e6323de1051..c212d55d815 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -67,6 +67,7 @@ * DBUG_EXECUTE_IF * incremental mode (-#+t:-d,info ...) * DBUG_SET, _db_explain_ + * thread-local settings * */ @@ -547,6 +548,7 @@ void _db_set_(CODE_STATE *cs, const char *control) if (!rel) sign=0; c= *control++; if (*control == ',') control++; + /* XXX when adding new cases here, don't forget _db_explain_ ! */ switch (c) { case 'd': if (sign < 0 && control == end) @@ -857,6 +859,7 @@ int _db_explain_ (CODE_STATE *cs, char *buf, int len) op_bool_to_buf('P', cs->stack->flags & PROCESS_ON); op_bool_to_buf('r', cs->stack->sub_level != 0); op_intf_to_buf('t', cs->stack->maxdepth, MAXDEPTH, TRACING); + op_bool_to_buf('T', cs->stack->flags & TIMESTAMP_ON); op_bool_to_buf('S', cs->stack->flags & SANITY_CHECK_ON); *buf= '\0'; |