database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed compiler warnings

Browse Source 
server-tools/instance-manager/angel.cc:
  Compiler warnings
sql/event_queue.cc:
  Compier warnings
sql/event_scheduler.cc:
  Compiler warnings
sql/events.cc:
  Compiler warnings
This commit is contained in:
unknown
2007-03-01 16:39:00 -07:00
parent 38a8283c6d
commit 2e34602392
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/angel.cc
View File

@ -349,8 +349,6 @@ static int angel_main_loop()
int Angel::main() int Angel::main()
{ {
int ret_status;
log_info("Angel: started."); log_info("Angel: started.");
/* Open log file. */ /* Open log file. */

4
sql/event_queue.cc
View File

@ -201,7 +201,7 @@ void
Event_queue::create_event(THD *thd, Event_queue_element *new_element) Event_queue::create_event(THD *thd, Event_queue_element *new_element)
{ {
DBUG_ENTER("Event_queue::create_event"); DBUG_ENTER("Event_queue::create_event");
DBUG_PRINT("enter", ("thd=0x%lx et=%s.%s",thd, DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd,
new_element->dbname.str, new_element->name.str)); new_element->dbname.str, new_element->name.str));
if (new_element->status == Event_queue_element::DISABLED) if (new_element->status == Event_queue_element::DISABLED)
@ -209,7 +209,7 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element)
else else
{ {
new_element->compute_next_execution_time(); new_element->compute_next_execution_time();
DBUG_PRINT("info", ("new event in the queue 0x%lx", new_element)); DBUG_PRINT("info", ("new event in the queue: 0x%lx", (long) new_element));
LOCK_QUEUE_DATA(); LOCK_QUEUE_DATA();
queue_insert_safe(&queue, (byte *) new_element); queue_insert_safe(&queue, (byte *) new_element);

16
sql/event_scheduler.cc
View File

@ -289,9 +289,8 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event)
res= post_init_event_thread(thd); res= post_init_event_thread(thd);
DBUG_ENTER("Event_worker_thread::run"); DBUG_ENTER("Event_worker_thread::run");
DBUG_PRINT("info", ("Baikonur, time is %d, BURAN reporting and operational." DBUG_PRINT("info", ("Time is %ld, THD: 0x%lx",
"THD=0x%lx", time(NULL), thd)); (long) time(NULL), (long) thd));
if (res) if (res)
goto end; goto end;
@ -349,7 +348,7 @@ end:
*/ */
events_facade->drop_event(thd, event->dbname, event->name, FALSE); events_facade->drop_event(thd, event->dbname, event->name, FALSE);
} }
DBUG_PRINT("info", ("BURAN %s.%s is landing!", event->dbname.str, DBUG_PRINT("info", ("Done with Event %s.%s", event->dbname.str,
event->name.str)); event->name.str));
delete event; delete event;
@ -522,7 +521,8 @@ Event_scheduler::run(THD *thd)
break; break;
} }
DBUG_PRINT("info", ("get_top returned job_data=0x%lx", event_name)); DBUG_PRINT("info", ("get_top_for_execution_if_time returned "
"event_name=0x%lx", (long) event_name));
if (event_name) if (event_name)
{ {
if ((res= execute_top(thd, event_name))) if ((res= execute_top(thd, event_name)))
@ -571,7 +571,7 @@ Event_scheduler::execute_top(THD *thd, Event_queue_element_for_exec *event_name)
pre_init_event_thread(new_thd); pre_init_event_thread(new_thd);
new_thd->system_thread= SYSTEM_THREAD_EVENT_WORKER; new_thd->system_thread= SYSTEM_THREAD_EVENT_WORKER;
event_name->thd= new_thd; event_name->thd= new_thd;
DBUG_PRINT("info", ("BURAN %s@%s ready for start t-3..2..1..0..ignition", DBUG_PRINT("info", ("Event %s@%s ready for start",
event_name->dbname.str, event_name->name.str)); event_name->dbname.str, event_name->name.str));
/* Major failure */ /* Major failure */
@ -581,11 +581,11 @@ Event_scheduler::execute_top(THD *thd, Event_queue_element_for_exec *event_name)
++started_events; ++started_events;
DBUG_PRINT("info", ("Launch succeeded. BURAN is in THD: 0x%lx", (long) new_thd)); DBUG_PRINT("info", ("Event is in THD: 0x%lx", (long) new_thd));
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
error: error:
DBUG_PRINT("error", ("Baikonur, we have a problem! res: %d", res)); DBUG_PRINT("error", ("Event_scheduler::execute_top() res: %d", res));
if (new_thd) if (new_thd)
{ {
new_thd->proc_info= "Clearing"; new_thd->proc_info= "Clearing";

2
sql/events.cc
View File

@ -923,7 +923,7 @@ Events::load_events_from_db(THD *thd)
bool clean_the_queue= TRUE; bool clean_the_queue= TRUE;
DBUG_ENTER("Events::load_events_from_db"); DBUG_ENTER("Events::load_events_from_db");
DBUG_PRINT("enter", ("thd=0x%lx", thd)); DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
if ((ret= db_repository->open_event_table(thd, TL_READ, &table))) if ((ret= db_repository->open_event_table(thd, TL_READ, &table)))
{ {