diff options
| author | andrey@lmy004. <> | 2006-02-07 19:37:26 +0100 |
|---|---|---|
| committer | andrey@lmy004. <> | 2006-02-07 19:37:26 +0100 |
| commit | 64c34f101f2143d6215cabf9ba2cee8f55bf3976 (patch) | |
| tree | 59ed783abbabc6d8608483527ab1eb667302c336 /sql/event_timed.cc | |
| parent | 4e64543e547896851a4b11d5385fe3ec81181457 (diff) | |
| parent | 4ba2a3322bb58646513e89e4d32d25988163a512 (diff) | |
| download | mariadb-git-64c34f101f2143d6215cabf9ba2cee8f55bf3976.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
Diffstat (limited to 'sql/event_timed.cc')
| -rw-r--r-- | sql/event_timed.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sql/event_timed.cc b/sql/event_timed.cc index 28d21089b74..e585f6252ca 100644 --- a/sql/event_timed.cc +++ b/sql/event_timed.cc @@ -877,20 +877,10 @@ int event_timed::drop(THD *thd) { TABLE *table; - int ret= 0; + uint tmp= 0; DBUG_ENTER("event_timed::drop"); - if (evex_open_event_table(thd, TL_WRITE, &table)) - DBUG_RETURN(-1); - - if (evex_db_find_event_aux(thd, dbname, name, definer, table)) - DBUG_RETURN(-2); - - if ((ret= table->file->ha_delete_row(table->record[0]))) - DBUG_RETURN(ret); - - close_thread_tables(thd); - DBUG_RETURN(0); + DBUG_RETURN(db_drop_event(thd, this, false, &tmp)); } |