diff options
| author | unknown <andrey@lmy004.> | 2006-02-16 01:27:36 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-16 01:27:36 +0100 |
| commit | 74b2989dc4fbf8c2aebc6121539f493ecdd0c879 (patch) | |
| tree | 3991021bdc249111af04e3b0de1a03305a8fb538 /sql/sql_db.cc | |
| parent | ea8a26c6f36a3896ea11c8e618e69fa6a8515a6f (diff) | |
| parent | fea4742db5b5f5531b0e2d30ccee7883f54b0e80 (diff) | |
| download | mariadb-git-74b2989dc4fbf8c2aebc6121539f493ecdd0c879.tar.gz | |
merge
mysql-test/r/events.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/event.cc:
manual merge
sql/event.h:
manual merge
sql/event_executor.cc:
manual merge
sql/event_timed.cc:
manual merge
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index a7a7327bb87..885643cf899 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -20,6 +20,7 @@ #include "mysql_priv.h" #include <mysys_err.h> #include "sp.h" +#include "event.h" #include <my_dir.h> #include <m_ctype.h> #ifdef __WIN__ @@ -870,6 +871,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) exit: (void)sp_drop_db_routines(thd, db); /* QQ Ignore errors for now */ + (void)evex_drop_db_events(thd, db); /* QQ Ignore errors for now */ start_waiting_global_read_lock(thd); /* If this database was the client's selected database, we silently change the |