diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 09:01:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 09:01:01 +0300 |
| commit | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (patch) | |
| tree | cc24f0e4e9241920329865a1b66c1d086aaeaa9a /sql/events.cc | |
| parent | 675c22c065110be03a5fab82442d2c3dc32aefff (diff) | |
| parent | a0588d54a20488b17a178244989e1abc5151a88a (diff) | |
| download | mariadb-git-80ed136e6dd4a021b1fc9b7bd7077bf989c3d247.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/events.cc b/sql/events.cc index 33ddcdac3cb..9f0aef885df 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -662,8 +662,16 @@ Events::drop_schema_events(THD *thd, const char *db) */ if (event_queue) event_queue->drop_schema_events(thd, &db_lex); - db_repository->drop_schema_events(thd, &db_lex); - + if (db_repository) + db_repository->drop_schema_events(thd, &db_lex); + else + { + if ((db_repository= new Event_db_repository)) + { + db_repository->drop_schema_events(thd, &db_lex); + delete db_repository; + } + } DBUG_VOID_RETURN; } |