database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

Browse Source 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
This commit is contained in:
cbell/Chuck@mysql_cab_desk.
2007-03-29 09:54:59 -04:00
parent f02726e72a 0627a31d7d
commit a591514a67
26 changed files with 1053 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/event_queue.cc
View File

@@ -199,7 +199,8 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element)
DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd,
new_element->dbname.str, new_element->name.str));
if (new_element->status == Event_queue_element::DISABLED)
if ((new_element->status == Event_queue_element::DISABLED)
|| (new_element->status == Event_queue_element::SLAVESIDE_DISABLED))
delete new_element;
else
{
@@ -235,7 +236,8 @@ Event_queue::update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
DBUG_ENTER("Event_queue::update_event");
DBUG_PRINT("enter", ("thd: 0x%lx et=[%s.%s]", (long) thd, dbname.str, name.str));
if (new_element->status == Event_queue_element::DISABLED)
if ((new_element->status == Event_queue_element::DISABLED) ||
(new_element->status == Event_queue_element::SLAVESIDE_DISABLED))
{
DBUG_PRINT("info", ("The event is disabled."));
/*