diff options
| author | unknown <andrey@lmy004.> | 2006-07-10 14:42:29 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-07-10 14:42:29 +0200 |
| commit | 5d91dc2560836ae28351baf446df7bee97e2cd05 (patch) | |
| tree | 28a786dfaf77132889807ad9f7ff5dbd568f9707 /sql/sql_db.cc | |
| parent | e8699b56140571305b898c29bdc45a5bab117a45 (diff) | |
| parent | 974eecc246db18e29e5ef06db6f48a0f4b3f7951 (diff) | |
| download | mariadb-git-5d91dc2560836ae28351baf446df7bee97e2cd05.tar.gz | |
Manual merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/events_logs_tests.result:
Auto merged
mysql-test/t/events_logs_tests.test:
Auto merged
mysql-test/t/events_stress.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/event_data_objects.cc:
manual merge
sql/events.cc:
manual merge
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 41e7e5df1f7..541ed9c7cc4 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -904,7 +904,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 */ - error= Events::drop_schema_events(thd, db); + error= Events::get_instance()->drop_schema_events(thd, db); /* If this database was the client's selected database, we silently change the client's selected database to nothing (to have an empty SELECT DATABASE() |