diff options
| author | unknown <andrey@lmy004.> | 2006-02-07 19:37:26 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-07 19:37:26 +0100 |
| commit | 9b479e037353f36380d48c544b0e62fedae40cb6 (patch) | |
| tree | 59ed783abbabc6d8608483527ab1eb667302c336 /sql/event_timed.cc | |
| parent | 3eb41de8cb5aaafcc0a2ba37863114b4ad7bd2fb (diff) | |
| parent | 99eb6eb6610155f279508c86853d9133d1089bf2 (diff) | |
| download | mariadb-git-9b479e037353f36380d48c544b0e62fedae40cb6.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
sql/event_timed.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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)); } |