diff options
author | unknown <andrey@example.com> | 2006-09-12 12:26:12 +0200 |
---|---|---|
committer | unknown <andrey@example.com> | 2006-09-12 12:26:12 +0200 |
commit | 04a5f335d3eaa878ebbc87eeab06dcbf3458fdb7 (patch) | |
tree | ae831e3cf94166f42a8cf2ff10194f4359a06d9d /sql/events.cc | |
parent | 53267edaf6db74ee4e9e598a96ee8c5c0404051e (diff) | |
download | mariadb-git-04a5f335d3eaa878ebbc87eeab06dcbf3458fdb7.tar.gz |
WL#3337 (Event scheduler new architecture)
Remove SHOW SCHEDULER STATUS command and migrate the
information output to `mysqladmin debug` (COM_DEBUG)
SHOW SCHEDULER STATUS was introduced in 5.1.11, provided
some debug information about event scheduler internals and
was enabled only in debug builds.
sql/event_queue.cc:
Remove SHOW SCHEDULER STATUS. Reporting still will be
there but through COM_DEBUG (mysqladmin debug)
sql/event_queue.h:
dump_internal_status cannot return an error, therefore it
should be void.
sql/event_scheduler.cc:
Remove SHOW SCHEDULER STATUS. Reporting still will be
there but through COM_DEBUG (mysqladmin debug)
sql/event_scheduler.h:
dump_internal_status cannot return an error, therefore it
should be void.
sql/events.cc:
Change from outputting the internal data from
the wire to the standard output. SHOW SCHEDULER STATUS was
removed.
sql/events.h:
dump_internal_status() cannot return an error, therefore
it should be void
sql/lex.h:
remove SCHEDULER as recognized word. This is part
of removing SHOW SCHEDULER STATUS
sql/sp_head.cc:
SQLCOM_SHOW_SCHEDULER_STATUS has been removed
sql/sql_lex.h:
SQLCOM_SHOW_SCHEDULER_STATUS has been removed
sql/sql_parse.cc:
SQLCOM_SHOW_SCHEDULER_STATUS has been removed
sql/sql_test.cc:
Dump Events' internal information on COM_DEBUG
sql/sql_yacc.yy:
SQLCOM_SHOW_SCHEDULER_STATUS has been removed
Diffstat (limited to 'sql/events.cc')
-rw-r--r-- | sql/events.cc | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/sql/events.cc b/sql/events.cc index f847541d217..10a8be948ef 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -744,32 +744,20 @@ Events::destroy_mutexes() SYNOPSIS Events::dump_internal_status() - thd Thread - - RETURN VALUE - FALSE OK - TRUE Error */ -bool -Events::dump_internal_status(THD *thd) +void +Events::dump_internal_status() { DBUG_ENTER("Events::dump_internal_status"); - Protocol *protocol= thd->protocol; - List<Item> field_list; + puts("\n\n\nEvents status:"); + puts("LLA = Last Locked At LUA = Last Unlocked At"); + puts("WOC = Waiting On Condition DL = Data Locked"); - field_list.push_back(new Item_empty_string("Name", 30)); - field_list.push_back(new Item_empty_string("Value",20)); - if (protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS | - Protocol::SEND_EOF)) - DBUG_RETURN(TRUE); + scheduler->dump_internal_status(); + event_queue->dump_internal_status(); - if (scheduler->dump_internal_status(thd) || - event_queue->dump_internal_status(thd)) - DBUG_RETURN(TRUE); - - send_eof(thd); - DBUG_RETURN(FALSE); + DBUG_VOID_RETURN; } |